before merge
New entity season
Merge branch 'master' of https://github.com/jadobi/tv-show-observer.git

Conflicts:
	tso/src/main/java/de/fh_kl/adt/tso/acessor/SQLLiteAccessor.java
	tso/src/main/java/de/fh_kl/adt/tso/acessor/TheTvDBAccessor.java
	tso/src/main/java/de/fh_kl/adt/tso/helper/SearchResultAdapter.java
Merge branch 'master' of https://github.com/jadobi/tv-show-observer.git
some more functionality