Resolved bug in category activity
Merge branch 'kaveri' into godavari

Conflicts:
	MuseAndroid.iml
Spell Check
Merge branch 'integration' into godavari

Conflicts:
	MuseAndroid.iml
	src/main/java/com/ehc/Muse/PlayActivity.java