Merge branch 'devel_new'
Merge branch 'master' of https://github.com/renhx/genius_cinema