Merge branch 'master' into import_data
Fixed <blank> to '/' for ALL ACTi cameras
Fixed <blank> URLs for ACTi cameras Merge branch 'import_data' of https://github.com/evercam/cambase into import_data