Development coding
Merge branch 'master' of https://github.com/Mediagroup5/BarrocIt

Conflicts:
	website/app/development/index.php
Merge branch 'master' of https://github.com/Mediagroup5/BarrocIt