tmp
Merge branch 'develop' into feature/prettify

* develop:
  review
  added right content container
  added highlighting for the active menu item
  added footer link list

Conflicts:
	lib/generators/cms/kickstart/templates/app/cells/footer/show.html.haml
	lib/generators/cms/kickstart/templates/app/cells/footer_cell.rb
updates gems
Merge branch 'feature/prettify' into develop

* feature/prettify:
  updates gems
  tmp