.
Merge branch 'master' of
https://github.com/manicwombat/turnitup-beta.git

Conflicts:
	TurnItUpBeta/AndroidManifest.xml
Merge branch 'master' of https://github.com/manicwombat/turnitup-beta.git
..
Merge branch 'master' of
https://github.com/manicwombat/turnitup-beta.git

Conflicts:
	TurnItUpBeta/src/com/need2/turnitup/beta/TurnItUpActivity.java
Edit inserting new userID into the joiner list for the joinEvent
Merge branch 'master' of
https://github.com/manicwombat/turnitup-beta.git

Conflicts:
	TurnItUpBeta/src/com/need2/turnitup/beta/TurnItUpActivity.java