added camera
ip display added
conflicts fixed