deleted all
Merge branch 'dev01' into dev

Conflicts:
	app/app.js
	app/controllers/controller.js
	app/partials/showall.html
	app/services/spiceUpServices.js
	index.html
	libs/lungo/lungo.css