Update js, css
Merge branch 'trunk' of https://github.com/voer-platform/vpw into trunk

Conflicts:
	static/css/style.css