More fixes
Merge branch 'master' of https://github.com/nmcalabroso/BuildEx

Conflicts:
	application/controllers/experiment.php
	css/custom.css