Merge branch 'online_version' of https://github.com/cesarandreu/laser_tag_android
Merge branch 'master' of https://github.com/cesarandreu/laser_tag_android