trying to remove demo dir
Merge branch 'develop'

Fix bower.json