Finished backend part
Merge branch 'back-office'