integrating entitycontroller
integrating entitycontroller
Merge branch 'master' of https://github.com/svennyffenegger/secure-password-manager

Conflicts:
	htdocs/class.entitycontroller.php
entry