further work on password/login system. also removed DB triggers
 fixed merge conflicts