fixed few bugs and implement few cool features for server
Merge remote-tracking branch 'origin/master'