Updated android generator to fit new template
Merge branch 'master' of github.com:rasmusgreve/questionaire