Update 1210
Merge pull request #1 from framgia/os1210

Update 1210
Update
Merge pull request #2 from framgia/update1510

Update
Merge pull request #2 from framgia/update1510

Update
Task1 - sjfhalsjdflkajhdf
Merge pull request #3 from bs90/task1

Task1
update
Merge branch 'develop' of github.com:framgia/framgia_os
release auto order
Merge branch 'master' of github.com:linhnt/framgia_os
release auto order
update
Merge branch 'master' of github.com:linhnt/framgia_os
update
game_click
Merge pull request #5 from quynhbv/game_click

game_click
add websocket
Merge pull request #6 from chuanhtuan/master

add websocket
update websocket