possibly fix the layout() problems
fix bug 417
clarify use of ocedata
Merge branch 'layout' into develop

Conflicts:
	DESCRIPTION
	NEWS