3dView modified
Merge branch 'master' of https://github.com/hatc-th/thyx

Conflicts:
	web/thyx/flyplan/flyPlanEdit.jsp
Merge branch 'master' of https://github.com/hatc-th/thyx