Merge pull request #38 from dimagi/android-intent

Android icon for androidintent question type in vellum
Merge branch 'master' of github.com:dimagi/hqstyle-src into vellum-multimedia