flux
Merge branch 'master' of https://github.com/vhalme/TravellerLog.git

Conflicts:
	src/main/webapp/flux2-ang.html
	src/main/webapp/flux2-ang.js