[Ernesto] - using asset-url to fix asset pipeline in OpenShift
Merge branch 'master' of https://github.com/techo/pagos

Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less