sync
Merge

Conflicts:
	modules/aboutDialog/about.js