working project with new controller(neel)
all work without finalized
Merge branch 'master' of https://github.com/fourneth/site-manager

Conflicts:
	client/web/src/main/webapp/app/fourneth/ims/view/layout/CenterPanel.js