commit

commit
commit

commit
Merge branch 'master' of https://github.com/dedocibula/ScreenJunkies

Conflicts:
	src/main/webapp/WEB-INF/views/index.jsp
	src/main/webapp/WEB-INF/views/relation/directors.jsp