multiple player multiple unit support
Merge branch 'dev_anpatel'
Merge branch 'master' into dev_sramanujan