Add Doses controllers
Merge branch 'backend' into frontend

Conflicts:
	.cache