broke all of tim's changes
Merge branch 'master' of https://github.com/psantiago/Splity

Conflicts:
	DataModel/ProjectSource.cs