12apr2014

over all changes
Merge branch 'master' of https://github.com/aspnetdemouser/comp2014