RESTful delivery routes
Merge branch 'master' into openshift
RESTful delivery routes
Merge branch 'master' into openshift

Conflicts:
	routes.rb