Fixed softdelete
Fixed softdelete
Fixed softdelete
Merge branch 'master' of https://github.com/Intermesh/intermesh-angular-example

Conflicts:
	app/css/scss/app.css