fixed errors
Completed admin part
Merge branch 'master' of github.com:neeraji2it/rcms_new