Clean up and refactoring
Merge branch 'develop' of https://github.com/2359media/AndroidAnimator into develop

Conflicts:
	Animation_demo/.settings/org.eclipse.jdt.core.prefs