Merge branch 'master' of https://github.com/fgaule/swagger-springmvc

Conflicts:
	swagger-springmvc/src/main/java/com/mangofactory/swagger/readers/operation/OperationParameterReader.java
Merge branch 'master' of https://github.com/fgaule/swagger-springmvc

Conflicts:
	swagger-springmvc/src/main/java/com/mangofactory/swagger/readers/operation/OperationParameterReader.java