solved conflict
Merge branch 'back-end' of git@github.com:smartcampuslab/smartcampus.openservices.git into back-end
js fixes
Merge branch 'back-end' of git@github.com:smartcampuslab/smartcampus.openservices.git into back-end