adjusted directory & file names
Merge branch 'master' into gh-pages

Conflicts:
	display/app/js/services.js