camera cluster operation dropdown
camera cluster operation dropdown
camera cluster operation dropdown
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/business/CameraClusterBLL.java
	app/business/CameraClusterBLLImpl.java
	app/controllers/CameraClusterController.java
	app/dao/CameraClusterDao.java
	app/dao/CameraClusterDaoImpl.java
	app/service/CameraClusterService.java
	app/service/CameraClusterServiceImpl.java