jshint
Merge branch 'master' into elevators

Conflicts:
	app/scripts/models/elevator.js