Merge branch 'master' of https://github.com/emilibrishimov/paranoia_password_manager

Conflicts:
	app/collections/identities.coffee
	app/views/identity.coffee
	app/views/new_identity.coffee
	app/views/templates/new_identity.hbs
Merge branch 'master' of https://github.com/emilibrishimov/paranoia_password_manager

Conflicts:
	app/views/templates/new_identity.hbs