I dont know what i changed
Revert "I dont know what i changed"

This reverts commit b2970b21d68eca640393b0f8d70a99aff8ae4f40.
Merge branch 'master' of https://github.com/attoken/TeamDauntless
Changed functions on create user and create family
Merge branch 'master' of https://github.com/attoken/TeamDauntless
Merge branch 'Bernard'

Conflicts:
	Project/AndroidManifest.xml
	Project/bin/AndroidManifest.xml
	Project/bin/Project.apk
	Project/bin/classes.dex
	Project/bin/classes/com/dauntless/project/MainActivity.class
	Project/bin/resources.ap_
	Project/src/com/dauntless/project/MainActivity.java
	TestAndroidToPHP/bin/classes/com/example/testandroidtophp/MainActivity.class