changed expected behavior for #721
simple mock of surveyApp.ngScope
new way to set choiceList (doesn't depend on idAttribute)
kf #739. link to kobocat
Merge pull request #209 from kobotoolbox/kf739

kf #739
Merge branch 'master' into tp717
moved option name sluggification into the "finalize" step. added options parameter to XLF.sluggify. Testing expected behavior of the model on options
using modified XLF.sluggify function (with options) to specify how option names should be shortened.