incorporating global user id
Merge branch 'master' of github.com:minhtrangvy/AirPool

Conflicts:
	app/src/main/java/com/airpool/EditGroupActivity.java
	app/src/main/java/com/airpool/LoginActivity.java