preserve utf in prettyfying
json autogenerated files
Merge branch 'master' of github.com:elgaard/DSR-roprotokol

Conflicts:
	frontend/app/data/boatdamages.json
	frontend/app/data/boats.json
	frontend/app/data/destinations.json
	frontend/app/data/maketestdata.sh
	frontend/app/data/rower_statistics.json
	frontend/app/data/rowers.json
	frontend/app/data/triptypes.json