Fixing web.config (or IIS will fail to load the website due to duplicated static content mappings)
Merge branch 'master' of github.com:TeamMentor/TM_4_0_Design