new bower config generation
new website generation

Conflicts:
	index.html