got rid of boolean errors in usr controller
Merge branch 'controller' into dev