added scopes
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