a test class to test IDE formatting settings
Merge remote-tracking branch 'origin/develop' into develop