Merge branch 'TVFREAKZ_1_0' of https://github.com/PaulStat/TVFreakZ into TVFREAKZ_1_0

Conflicts:
	src/main/java/com/tvfreakz/model/Channel.java
	src/main/java/com/tvfreakz/model/ChannelProgramme.java
	src/main/java/com/tvfreakz/model/Director.java
	src/main/java/com/tvfreakz/model/Episode.java
	src/main/java/com/tvfreakz/model/Genre.java
	src/main/java/com/tvfreakz/model/Performer.java
	src/main/java/com/tvfreakz/model/Programme.java