Michael Updated 20140818
Merge remote-tracking branch 'origin/master'

Conflicts:
	Form1.cs
	WebDataController.cs