change styles, format JSPs
Merge remote-tracking branch 'origin/develop' into develop