0502-Friday
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dev/js/default.js