V
V1.1.1 + About
V1.1.1 + About
Merge branch 'master' of https://github.com/cristi92b/GS2

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