refactoring and stuff
Merge branch 'master' of https://github.com/miloradstevanovic/cinema_000.git