code style changes
standarize code style. 4 spaces and few mores things.
js-beautify sublime plugin used
Merge branch 'develop' into feature/socket-1.0-support
standarize code style