added new questions
changed order of api choices. added both option for device question
added a bunch more questions
Merge branch 'master' of https://github.com/mroll/estimator