* fixed conflicts
* fixed URL templating
* added springfox version
* moved dependency declaration
* further fix
* more fixes
* optimized import
* reverting to first version to check
* reverted to version before new dependency
* added dependency with version in correct place
* added to dependencyManagement
354f8910bf