design ready 20 %
Merge branch 'feature-design' into develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	Gemfile
	Gemfile.lock
	db/development.sqlite3