Merge branch 'master' into dev
Merge branch 'master' into dev
Correction to Edit section of HOW TO doc
Add travis configuration and fix jshint issues
Merge branch 'master' into dev
Add grunt install step for travis
Merge branch 'master' into dev
Fix travis build.
Merge branch 'master' into dev
Merge branch 'upsrteam/dev'