urls
urls
Merge branch 'master' of github.com:phaidra/phaidra-bagger

Conflicts:
	public/js/services/frontend.js
	public/js/services/metadata.js
	templates/layouts/default.html.ep
megree