refactored on animation logic
Merge branch 'kaveri' into godavari

Conflicts:
	MuseAndroid.iml
Spell Check