added readme for build status
Adds defaultValue to non-body parameters

Renames devaultValue
Fixes failing test caused by model property order
Sets travisci badge to develop_2.0 branch
Merge pull request #746 from adrianbk/build-badge

Sets travisci badge to develop_2.0 branch
Adds code quality checks (test coverage & dependency convergence)
Merge pull request #745 from adrianbk/default-values

Adds defaultValue to non-body parameters
Merge pull request #747 from adrianbk/code-quality

Adds code quality checks (test coverage & dependency convergence)
added scopes
Renaming test to match maven's default test patterns
Merge pull request #750 from adrianbk/failing-tests

Renaming test to match maven's default test patterns
Merge branch 'develop_2.0' of github.com:swagger-api/swagger-core into develop_2.0
renamed class to differentiate between implementation and definition
cleaned up error message, will further this soon
added file property
renamed auth definitions
Merge remote-tracking branch 'upstream/develop_2.0' into develop_2.0_allOf

Conflicts:
	modules/swagger-core/src/test/scala/ScalaModelTest.scala
RESOLVED