material
Merge branch 'master' into material

Conflicts:
	bower.json
Merge branch 'master' into material
update angular-material
add index view
upgrade to angular-material 0.6.0-rc3
Merge branch 'material'

Conflicts:
	app/partials/nav.jade
bump angular version