Merge pull request #1 from WebActivities/master

pull from master to gh-pages
Merge pull request #2 from WebActivities/gh-pages

Merge pull request #1 from WebActivities/master