Starting all over with new Yeoman generator
Merge branch 'master' of https://github.com/sigilworks/ubique

Conflicts:
	app/index.html
	app/scripts/app.js