Reorg of assets.
Merge branch 'master' of https://github.com/sourcebits-robertbiggs/chui-perfumes-angular

Conflicts:
	views/index.ejs