Merge branch 'beta' into mergemaster

# Conflicts:
#	src/main.cpp

src/zcash/util.h

@@ -1,5 +1,5 @@
-#ifndef __ZCASH_UTIL_H
-#define __ZCASH_UTIL_H
+#ifndef ZC_UTIL_H_
+#define ZC_UTIL_H_
 
 #include <vector>
 #include <cstdint>
@@ -8,4 +8,4 @@ std::vector<unsigned char> convertIntToVectorLE(const uint64_t val_int);
 std::vector<bool> convertBytesVectorToVector(const std::vector<unsigned char>& bytes);
 uint64_t convertVectorToInt(const std::vector<bool>& v);
 
-#endif // __ZCASH_UTIL_H
+#endif // ZC_UTIL_H_