Merge branch 'fix-5.1'
Use StickyGridHeaders 1.0 jar instead of library project.
Set headers sticky in code.
Add tmdb-java as jar dependency.
Fix classpath for new build tools (17).
Add support lib to SeriesGuide project, too.
Use latest trakt-java 1.4.0 snapshot jar instead of library project.
Change log for 5.2.
Bump version to 5.2.
Merge branch 'fix-5.2'
Merge branch 'release-6'

Conflicts:
	CHANGELOG.md
	SeriesGuide/.classpath
	SeriesGuideBeta/.classpath
	SeriesGuideFree/.classpath
	SeriesGuideFree/AndroidManifest.xml
	SeriesGuideX/.classpath
	SeriesGuideX/AndroidManifest.xml
Add billing activity to X manifest.
Remove sticky grid headers 1.0 jar.
Bump SeriesGuide X version to 6.1x.
Changelog for 6.1x.
Merge branch 'fix-6.1x' into beta