Action box better
Phase change overlays
Merge branch 'feature'

Conflicts:
	constants.js
Fixed constants