Finished email
Merge branch 'model' into development
CHanged order of sensors on backend