Code restructure
Merge branch 'master' into restructure-js

Conflicts:
	static/js/main.js
Merge branch 'restructure-js'