[ADD][MOD] working registration
[MRG]

Merge branch 'android_1_client_development' of
https://github.com/blstream/CaptureTheFlag.git into
android_1_client_development

Conflicts:
	android-client-1/src/com/blstream/ctf1/RegisterActivity.java