modified:   js/controllers/Account.js
	modified:   js/controllers/Category.js
Merge branch 'master' of https://github.com/chollaflower/PasswordManager