+templates, new version of UI and worked on modal
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	index.html