2.0.5
Merge branch 'master' of https://github.com/cristi92b/GS2

Conflicts:
	app/views/about/index.html.erb
	app/views/layouts/application.html.erb