rm user user controller
Merge branch 'master' of https://github.com/akhilrex/DMP_New
before pull
Merge branch 'master' of https://github.com/akhilrex/DMP_New
productivity is set up to January month
Merge branch 'master' of https://github.com/akhilrex/DMP_New

Conflicts:
	trunk/DMP/DMP/Controllers/UserController.cs
after pull