plane params
Merge branch 'master' of https://github.com/undefined-darkness/open-horizon

Conflicts:
	demo/plane_params.cpp