-reorganized the css and javascript files.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/webtsainterface/static/js/init.js