wip
new conflic
Merge branch 'demo' of github.com:MrDeLeTeD/po_translator into demo_2

Conflicts:
	po_translator.inc