Test commit
Merge branch 'master' of github.com:rsnipes/ur-calendar-dev

Conflicts:
	application/config/routes.php
Routes change