settings(address & about us)
Merge branch 'master' of https://github.com/fyymonica/monica

Conflicts:
	CampusCloudAndroid/AndroidManifest.xml
	CampusCloudAndroid/src/com/monica/campuscloudandroid/LoginActivity.java