Update engineer interface + Add modals
Update engineer interface + Add modals - MERGE
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/engineer.jade