Documentation and copyright and tests

authors: tmeehan akshoop nhhughes thhughes rnorlando
Fixed column management
Merge remote-tracking branch 'origin/column-fix' into devel

author: nhhughes
added tj's old commit to devel

author: nhhughes
Merge branch 'devel' into ui-improvements