changed interface of message resolver
Merge pull request #295 from BowlingX/2.2.x_2.9

Provide a way to create own i18n Message Interface Edit (2.9)
Fix option data type on models
don't NPE in swagger when the model property has a default value of null
A default value is not an optional value for swagger
exclude Options from high-level modeling
Merge remote-tracking branch 'origin/dont_model_options' into dont_model_options_2.10

Conflicts:
	swagger/src/main/scala/org/scalatra/swagger/Swagger.scala
Merge pull request #298 from kelseyq/dont_model_options_2.10

Don't model options 2.10