Updates to loginActivity.java
Merge remote-tracking branch 'Databox/master'