All of it!
Merge branch 'master' of https://github.com/haroldtreen/TeamUp

Conflicts:
	AndroidManifest.xml
	bin/classes/com/hci/teamup/R$attr.class
	bin/classes/com/hci/teamup/R$dimen.class
	bin/classes/com/hci/teamup/R.class
	res/layout/fragment_meeting.xml
	res/layout/fragment_profile.xml
	res/layout/fragment_team.xml
	res/values/strings.xml
	src/com/hci/teamup/LoginActivity.java
	src/com/hci/teamup/ProfileActivity.java
	src/com/hci/teamup/TabActivity.java