Make the ui more smart.
Merge branch 'master' of https://github.com/cinemaouvert/opp

Conflicts:
	src/config.h