Work on cycle front-end
Merge branch 'master' of https://github.com/zackpatterson/RampUp

2441ec67bcddfffce14f02ccc65769.

Conflicts:
	back/config/application.config.php
	back/module/CertType/view/cert-type/cert-type/index.phtml
	back/public/app/index.html
	back/public/app/scripts/app.js
	back/public/app/views/certType.html