xbmc.python version set to 2.1.0 and add-on version set to 2.1.2
Merge branch 'master' into Frodo

Conflicts:
	addon.xml
	changelog.txt
Merge branch 'master' into Frodo
Merge branch 'master' into Frodo
changelog.txt amended