* version bump
Merge branch 'eden-master' of github.com:Synopsi/XBMC into eden-master

Conflicts:
	addon.xml
	changelog.txt