builds again
Merge remote-tracking branch 'origin/master'

Conflicts:
	android/app/src/main/java/hack/goodnight/itsonme/LoginFragment.java