Fixed issue from merge with extra entry in manifest.
Merge branch 'master' of https://github.com/sadsyed/ConnexusSSAR
Fixed minor conflict with app location name and manifest
Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/ssar/apt/connexusssar/util/ConnexusSSARConstants.java
rudimentary login working...still needs work
Merge branch 'master' of https://github.com/sadsyed/ConnexusSSAR
Finished loging and did some message cleanup.
removed one additional toast