Merge pull request #14 from igorez/develop

Norb:
Merge pull request #15 from igorez/develop

Norb:
Merge pull request #16 from igorez/develop

Norb:
Merge pull request #17 from igorez/develop

Norb:
small fix
Merge branch 'master' of https://github.com/MurLemur/ErExt

Conflicts:
	common/content.main.js
add Sidzoku armory service? fix some bugs
add context menus on info page
add map tracing option to OVL,OPP,ODL
Norb: import/export.