test commit 1
Merge branch 'develop' of github.com:xxoro/MVC_project into develop

Conflicts:
	EmployeeInformation.Tests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	EmployeeInformation.v11.suo
	EmployeeInformation/App_Data/aspnet-EmployeeInformation-20131028232238.mdf
	EmployeeInformation/App_Data/aspnet-EmployeeInformation-20131028232238_log.ldf
	EmployeeInformation/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache