changed integration form.cs

Signed-off-by: David Lee <David.Lee@Agsgeo.eu>
Merge branch 'master' of https://github.com/david-AGSGeo/ICTD_Spring2014

Conflicts:
	Integration/Integration Control/Integration_Control/Integration_Control/Form1.cs

Signed-off-by: David Lee <David.Lee@Agsgeo.eu>