Fix a conflict when pushing to origin
Merge branch 'new_debian8_folder' of https://github.com/manupap1/ZoneMinder into new_debian8_folder