Merge commit
Merge branch 'master' of https://github.com/Spike121/INB302CapstoneProject

Conflicts:
	CSharpVersion/RecommenderAttacksAnalytics.v11.suo
	CSharpVersion/RecommenderAttacksAnalytics/Database/NHibernateUtil.cs

	CSharpVersion/RecommenderAttacksAnalytics/UI/DataSourceUploadContainerUC.xaml.cs