new info fields in preferences dialog
Merge branch 'master' into beta
updated ChangeLog
Merge branch 'master' into beta

Conflicts:
	ChangeLog