Merge pull request #1 from WebActivities/master

pull from master to gh-pages