Merge tag 'v.1.0.0' into develop

v.1.0.0

Conflicts:
	frontend/app/styles/main.scss