add "grunt-build-control"
create porfolio and download pages
Merge branch 'master' into dev
update menu
edit about view
Add google analytics
add footer
Merge branch 'dev'

Conflicts:
	app/index.html
	app/scripts/app.js
	app/styles/main.css
	app/views/about.html
	app/views/main.html
Merge remote-tracking branch 'origin/master'
add footer