Updated re-order in categories, courses and technologies
Merge branch 'master' of https://github.com/saldarriaga/102_kerry

Conflicts:
	protected/controllers/PresentationController.php
	themes/bootstrap/js/main.js