Handling orientation changes
Merge branch 'godavari' into integration

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