content and issue updates
Merge branch 'master' of https://github.com/tamojit/Mercury

Conflicts:
	LearningPod/assets/crashlytics-build.properties
	LearningPod/gen/com/learningpod/android/R.java
	LearningPod/res/values/com_crashlytics_export_strings.xml
minor changes
some content fixes