Merge branch 'develop' into feature/ruby-1.9

Conflicts:
	Gemfile.lock
	app/views/layouts/context/_banner.html.haml
	app/views/layouts/local/page/_title.html.haml
	app/views/layouts/local/sidebar/_index.html.haml
resolving conflicts between ruby 1.9 and new css code