Merge branch 'master' of github.com:Neamar/CineTime
Code cleanup, v13.