ticket 618 layout
Merge branch '618_layout' of gitlab.loc:ror_team into dev
switch branch dev
Created branch dev
Merge branch 'master' into dev
remove idea
Merge branch 'dev' into 647

Conflicts:
	Gemfile.lock