- commit
commit merge
Merge branch 'master' of https://github.com/ahetawal/cheese

Conflicts:
	src/com/stealthecheese/activity/LoginActivity.java
	src/com/stealthecheese/activity/TheftActivity.java
	src/com/stealthecheese/application/StealTheCheeseApplication.java