Merge branch 'hotfix/enablecors'
Web.config formatting
Bookmark.css was not included in project
Merge branch 'hotfix/0.0.3' into develop