minor refactor + cleanup
Merge branch 'master' of https://github.com/mateuszAdamiak/IT-application-project

Conflicts:
	server/travel-scheduler/app/controllers/TripController.java
	server/travel-scheduler/app/models/Point.java