Merge branch 'master' of https://github.com/ritey/xv950

Conflicts:
	app/routes.php