mah
Merge branch 'master' of github.com:HairyHearts/bearded-octo-computing-machine

Conflicts:
	MainActivity/src/org/hairyhearts/LoginActivity.java