all the shit
Merge branch 'master' of https://github.com/olavk/romu

Conflicts:
	administrator/language/et-EE/et-EE.com_oksjonid.ini
	administrator/language/et-EE/et-EE.com_oksjonid.sys.ini
	administrator/language/ru-RU/ru-RU.com_oksjonid.ini
	administrator/language/ru-RU/ru-RU.com_oksjonid.sys.ini