sync
Merge branch 'master' of https://github.com/lopesdasilva/trakt-java

Conflicts:
	src/main/java/com/jakewharton/trakt/entities/MediaBase.java
	src/main/java/com/jakewharton/trakt/entities/TvShow.java
	src/main/java/com/jakewharton/trakt/entities/TvShowEpisode.java