dds
 Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/Winnopeg/BTM-Translations into Winnopeg-master

Conflicts:
	sl_si.js
Merge branch 'Winnopeg-master'