From Acer-Laptop
Merge remote-tracking branch 'origin/master'

Conflicts:
	resources/cptdispatch.js
Merge branch 'master' of https://github.com/rahoward144/cpt
From Acer-Laptop