Bug fixing - SLH/android/Notification creating new instance
untracked files
Merge branch 'master' of https://github.com/nohsamp/cmu-mse-costcode

Conflicts:

mobile/bin/dexedLibs/ksoap2-android-assembly-3.0.0-jar-with-dependencies
-322e9ade74b2ec690ef3f24b483b8b25.jar