Add Proximity-Alert to extras
Merge branch 'master' into screenposition-tweaks

Conflicts:
	Gruntfile.coffee