style and more style
Merge remote-tracking branch 'origin/NewApp' into NewApp