...
Merge remote-tracking branch 'origin/master'

Conflicts:
	filmhandler/src/se/ixanon/filmhandler/client/Main.java