migrated to EntityFramework v5
Added equipment database, controller, model, and views
Added Database and Migration files
Fixed conflicts
Merge branch 'master' of https://github.com/bgoerdt/vsr-lighten-the-load-web-app into See_all_equipment

Conflicts:
	MissionPlanningWebApp/MissionPlanningWebApp.Tests/Controllers/AccountControllerTest.cs
	MissionPlanningWebApp/MissionPlanningWebApp/App_Data/aspnet-MissionPlanningWebApp-20140209160733.mdf
	MissionPlanningWebApp/MissionPlanningWebApp/App_Data/aspnet-MissionPlanningWebApp-20140209160733_log.ldf
	MissionPlanningWebApp/MissionPlanningWebApp/MissionPlanningWebApp.csproj
updated gitignore
Updated gitignore
Database
Merge branch 'master' of https://github.com/bgoerdt/vsr-lighten-the-load-web-app into See_all_equipment

Conflicts:
	.gitignore
	MissionPlanningWebApp/MissionPlanningWebApp/Migrations/Configuration.cs
	MissionPlanningWebApp/MissionPlanningWebApp/MissionPlanningWebApp.csproj
	MissionPlanningWebApp/MissionPlanningWebApp/Web.config
	MissionPlanningWebApp/packages/WatiN.2.1.0/WatiN.2.1.0.nuspec
Merge pull request #13 from bgoerdt/See_all_equipment

See all equipment