set up for change in module import
Cosmetics
Better handling of encodings
Added alternative string for German/FSK rating
Merge pull request #17 from Larnixva/germany-add

Added alternative string for German/FSK rating
Update changelog.txt
ensure that self.genre has a matching genre to genre_test before looking for it.
really test if it exists this time
Merge branch 'master' of github.com:Giftie/script.cinema.experience
remove utf-8 decoding from folder.py
finish testing for genres
Clean up index testing
Add script.module.simplejson to cover all bases...
Merge branch 'master' of github.com:Giftie/script.cinema.experience into Gotham

Conflicts:
	addon.xml