User can now add a "time" question
Merge branch 'master' into tp614
merge master into 614
Merge pull request #143 from kobotoolbox/tp614

User can add a "time" question