Merge branch 'origin/tryanderror'

Conflicts:
	.gitmodules
	source/plugin/dps_exadmincp