Merge branch 'map_model'

# Conflicts:
#	app/Http/Controllers/DevicesController.php
Status Job ID Name Coverage
  Test
canceled #120
unit_test

 
  Deploy
canceled #121
deploy_staging