style changes, shultze vote on hold
Merge remote-tracking branch 'yaniv/master'
Merge branch 'master' of https://github.com/amir99/OpenCommunity into responsive_1212