yan
Merge branch 'master' of https://github.com/PESTLab/team-a

Conflicts:
	ProjectForJenkins1/ProjectForJenkins1.v11.suo