iframe in index + firefox css
Merge branch 'master' of https://github.com/c2lknt/NLK_PG

Conflicts:
	src/main/webapp/css/three.css
	src/main/webapp/js/three.js