merge issue fixed
Merge branch 'Iteration5' of https://github.com/CrimeBuster/CrimeBusters into Iteration5

Conflicts:
	CrimeBusters.WebApp/Index.aspx