code formatting
Merge branch 'develop' of github.com:pindexis/togetherjs into develop