initial ui elements created
Merge branch 'megantulac' into development

Conflicts:
	client/layouts/main.html