configuring for staging
Merge branch 'development' of https://github.com/makapen/makapen.github.io into development

Conflicts:
	app/styles/components/components.css