Merge branch 'master' of https://github.com/andrewoodleyjr/RooRunner

Conflicts:
	application/controllers/manage.php
	application/logs/log-2013-06-12.php