Merge branch 'develop'
-sampler option is added to air mobile convention
Merge branch 'hazardsoft-sampler_option_ios' into develop