kewin make edit file work with update file stuff from controller
Merge remote-tracking branch 'origin/noServBranch' into ClientDevelopment

Conflicts:
	WebApplication1/Form.aspx.cs