Merge branch 'master' into hector
Web services hasta battle_info
Merge branch 'hector'