Merge pull request #1247 from modilabs/tagging

Formhub API: Tagging functionality
Merge branch 'master' into oauth2