Routes update
Merge branch 'master' of ssh://git@github.com/MKBid/TUBE.git

Conflicts:
	settings/routes.php