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

Conflicts:

Trakt-fragments/src/main/java/com/lopesdasilva/trakt/fragments/CalendarW
eekFragment.java