Merge remote-tracking branch 'origin/master'

Conflicts:
	Motor/Motor.css
	Motor/Motor.html