initial commit 2
Merge branch 'master' of https://github.com/bannister/RGP-SMART

Conflicts:
	config/global.dcf