adapted routes for merge
Merge branch 'master' of github.com:afalsario/commonart

Conflicts:
	app/routes.php
Merge pull request #3 from afalsario/alex

minor changes to pull request