Fix loading
Merge branch 'sven' of github.com:SvH/TravelSquare