Service company and appartment add edit work
Merge branch 'dev' of https://github.com/asad-innostark/PMS into dev