new views
Merge branch 'master' of https://github.com/farshid1/inventory

Conflicts:
	public/index.html
	public/js/app.js
	public/js/controllers/LoginCtrl.js
	public/js/controllers/UserCtrl.js
	public/js/services/InventoryService.js
	public/views/inventory.html
delete files