Added units
Merge branch 'develop' into feature/units

Conflicts:
	app/views/dashboard/index.html.erb
Merge branch 'feature/units' into develop