Fixed conflicts.
Merge branch 'devel' of github.com:svda/bikeabout.nl into devel
Added missing bracket.