stash
Merge branch 'master' of http://github.com/jhead12/dial4dough

Conflicts:
	app/src/build/main-min.js
	app/src/build/temp/custom.min.js
	app/src/modules/services/nav/nav-config.js