Smart Play Button
Merge branch 'develop' of github.com:NineWorlds/serenity-android into NineWorlds-sp

Conflicts:
	serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/EpisodeMediaContainer.java
	serenity-app/src/main/java/us/nineworlds/serenity/core/services/CompletedVideoRequest.java
	serenity-app/src/main/java/us/nineworlds/serenity/core/services/UpdateProgressRequest.java
	serenity-app/src/main/java/us/nineworlds/serenity/ui/activity/SerenityActivity.java
Add missing file
Remove pom
Merge pull request #211 from alonalbert/SmartPlayButton

Feature Request: Smart Play Button