bug+codestyle: Fix compile bugs and adjust code style

Change-Id: I008bb538441c099fa25b8b967fbf23ffce13a220
diff --git a/.gitmodules b/.gitmodules
index ef6b513..aa05731 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "ChronoSync"]
 	path = ChronoSync
 	url = https://github.com/bruinfish/ChronoSync.git
-	branch = security
+	branch = master