Backend dev

Merge backend devs with master