klapi-7 Admin interface for attributes + login and logout
Merge branch 'develop' of https://github.com/Klickrent/klapi into develop

Conflicts:
	client/app/app.js
	client/app/controllers/NavigationCtrl.js
	client/views/partials/admin/attributes.edit.tpl.jade
	client/views/partials/admin/filters.edit.tpl.jade
	client/views/partials/admin/products.edit.tpl.jade