Stuff
Merge branch 'master' of ssh://github.com/ItsOneClickAwesome/android

Conflicts:
	src/com/example/pockedin/ui/HomeActivity.java
	src/com/example/pockedin/ui/MainActivity.java