Commit Plan xml data with Error problem

The problem is that when you try to open a plan, we get an error. We
will attempt to fix it...but just an fyi
Merge branch 'master' of https://github.com/thefacegroup/Project4

Conflicts:
	CIS726_Assignment4/CIS726_Assignment2.v11.suo
	Service/CIS726_Assignment2.v11.suo