Added gradle build file for docs
Fixed Demo build
Merge branch 'develop'