Merge branch 'v3' into gh-pages

Conflicts:
	css/angular.css
	index.html
Merge branch 'v3' into gh-pages