bug fixes
Merge branch 'release/1.1.1'
bug fixes, user controller actions modified
Merge branch 'release/1.1.2'