astyle formatting
Merge branch 'master' into gui2