various additions
Merge branch 'front-end' of https://github.com/dannyoz/dod-theme-5 into front-end

Conflicts:
	public/js/main.js
	public/js/main.min.js
	public/views/partials/nav.html
	src/js/controllers/portfolio.js