[Promotion] - Backend 80%
[Promotion] - Front 50% / Back 80%
[Promotion] - Front 100% done / Back 80%
[Promotion]- 100% done
[Promotion] - 100% done + database
Merge remote-tracking branch 'origin/branch-40'
Merge remote-tracking branch 'origin/master'

Conflicts:
	Views/service/css/service.css