Added generic error string
deleted some parts of loginactivity
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is ahead of 'happenhub/master' by 3 commits.
#   (use "git push" to publish your local commits)
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   app/src/main/AndroidManifest.xml
#	modified:   app/src/main/java/com/happen/app/LoginActivity.java
#
Merge remote-tracking branch 'happenhub/master'