Merge pull request #1 from Sitefinity-SDK/master

Merged master in review