Merge branch 'master' of https://github.com/Irazzer/TVShowApp

Conflicts:
	src/de/dennisstodko/tvseries/MainActivity.java