rolled back
resolved conflicts
Merge branch 'master' of https://github.com/sapiens/MvcPowerTools