Cleaned up index, seperating css and js.
Merge remote-tracking branch 'origin/master' into design

Conflicts:
	interface/index.html
Merge remote-tracking branch 'origin/master' into design

Conflicts:
	interface/index.html
Merge remote-tracking branch 'origin/design'