Altering layout of aplication
Merge branch 'layout_view' into approval

Conflicts:
	Gemfile