regen bower
graceful dev
highlight dev url
Merge branch 'master' into material

Conflicts:
	bower.json