user controller
Merge branch 'testing' into development
added ci task