add OVL,OPP locations , and some fix
add active items in battle
refresh in chrome fix
map tracing teammates on aliens island
Автологин на кальки бодов,сидзоку,ЗК
Merge branch 'master' of github.com:MurLemur/ErExt into develop

Conflicts:
	common/options.html