Edit routes
fix dependency
Merge remote-tracking branch 'origin/develop' into develop
Validator for User
Merge remote-tracking branch 'origin/develop' into develop
package structure changes
minor changes
Moved nested creationof object to IoC
minor changes
working on javascript paging+sorting+filtering for trips (first stage)
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/resources/i18n/messages_ua.properties