Merge branch 'master' of https://github.com/cloudkeep/stockade

* 'master' of https://github.com/cloudkeep/stockade:
  stockade js object with alert functions, projects listing, create
  Added login/logout.
Add user search url and dummy view
create secret html improvements and js
Create projects.
Fix broken models.
Add initial create secret implementation and merge things
Add secret creation!
Merge branch 'master' of https://github.com/cloudkeep/stockade

* 'master' of https://github.com/cloudkeep/stockade:
  Add secrets table for ajaxing.
  iniital code for secret fetching, project list reload after creation
  Added projects table for ajaxing.
  Fix broken models.
  Create projects.
  create secret html improvements and js
  Add user search url and dummy view

Conflicts:
	stockade/urls.py
	vault/models.py
	vault/templates/vault/login.html
	vault/templates/vault/project.html
	vault/templates/vault/projects.html
	vault/views.py