Show options menu
sync
Merge branch 'master' of https://github.com/lopesdasilva/aTrakt

Conflicts:
	.idea/workspace.xml
	Trakt-fragments/src/main/java/com/lopesdasilva/trakt/fragments/WatchlistEpisodes.java