Gotham Push
use settings_to_log function from settings module
Fix settings_to_log function call
Merge branch 'master' into Gotham

Conflicts:
	addon.xml
Merge branch 'master' of github.com:Giftie/script.cinema.experience into Gotham
Merge branch 'master' into Gotham
Merge branch 'master' into Gotham

Conflicts:
	addon.xml
Merge branch 'master' of https://github.com/Giftie/script.cinema.experience into Gotham
Merge branch 'Gotham' of github.com:Giftie/script.cinema.experience into Gotham
Merge branch 'master' into Gotham

Conflicts:
	addon.xml
Merge branch 'master' of github.com:Giftie/script.cinema.experience into Gotham
Merge branch 'master' of https://github.com/Giftie/script.cinema.experience into Gotham
Merge branch 'Gotham' of https://github.com/Giftie/script.cinema.experience into Gotham
Merge branch 'Gotham' of github.com:Giftie/script.cinema.experience into Gotham
Merge branch 'master' of github.com:Giftie/script.cinema.experience into Gotham
Merge branch 'master' of github.com:Giftie/script.cinema.experience into Gotham

Conflicts:
	addon.py
	resources/lib/ce_player.py
Merge branch 'Gotham' of github.com:Giftie/script.cinema.experience into Gotham
Change wait until end function.