Merge branch 'master' into users_online-vinh
Merged branch 'users_online-vinh' to master
Merge branch 'master' of https://github.com/ksweta/Monopoly
Merge branch 'master' of https://github.com/ksweta/Monopoly
changed timed out time to 5 mins