Adds CyclistController::edit
Merge branch 'master' of github.com:czambel2/psychic-octo-dubstep

Conflicts:
	src/lib/Router.php