fixed test merge errors
Added Fighter model, view, and controller
Merge branch 'master' of https://github.com/bgoerdt/vsr-lighten-the-load-web-app into Missionparameters

Conflicts:
	MissionPlanningWebApp/MissionPlanningWebApp/App_Data/aspnet-MissionPlanningWebApp-20140209160733.mdf
	MissionPlanningWebApp/MissionPlanningWebApp/App_Data/aspnet-MissionPlanningWebApp-20140209160733_log.ldf