issue fixes
Merge branch 'master' of https://github.com/tamojit/Mercury

Conflicts:

LearningPod/src/com/learningpod/android/activities/MapActivityBeforeLogin.java