Merge branch 'release-2.0' into develop
Moved assets in 'Website' to 'Assets' folder

Also fixed up the File Replacements for them in TDS.
Removed unused Data folder
Fixed deployment settings for Page Events
Merge branch 'develop'