rolled back to commit, trying to pull changes to my dev box
Merge branch 'master' of https://github.com/kawalgrover/MARTA-Projects

Conflicts:
	Navigation/Features/MARTA Navigation/MARTA Navigation.feature
	Navigation/Navigation.csproj
	Navigation/_CONTROLTEMPLATES/SuiteLinks.ascx.cs
Merge branch 'master' of https://github.com/kawalgrover/MARTA-Projects
Merge branch 'master' of https://github.com/kawalgrover/MARTA-Projects
Term Store Mappings
Merge branch 'master' of https://github.com/kawalgrover/MARTA-Projects
Added Term Store Mapping