add flatui
Merge branch 'flat' into devTemp

Conflicts:
	public/index.html
	public/views/main.html
begin flat ui integration
Merge branch 'devTemp' into dev