gitignore for Idea fix
Issue: javascript include optimization
Added login form, navbar, player
Fixed jstl c:url bug with js and css resources.
Borders for divs are temporary returned - now you can see bug with width
Merge branch 'develop' of https://github.com/staple-stable/KonfachTV into
develop - mostly my fail for not pulling

Conflicts:
	src/main/webapp/WEB-INF/views/index.jsp
	src/main/webapp/resources/css/style.css