Updated payroll code
Merge https://github.com/nerdix/hrms

Conflicts:
	hrmstry/models.py
	hrmstry/models.py~
	hrmstry/views.py~
	idify/urls.py
	idify/urls.py~
	static/css/style.css~
	templates/addcontact.html~
	templates/adduser.html~
	templates/admin_announcement.html~
	templates/admin_profile.html~
	templates/admn_leave_summary.html~
	templates/allcontacts.html~
	templates/allprojects.html~
	templates/announcement.html~
	templates/apply_leave.html~
	templates/approve.html~
	templates/createproject.html~
	templates/crtancmnt.html~
	templates/edituser.html~
	templates/empcontacts.html~
	templates/index.html~
	templates/leave_summary.html~
	templates/leave_usrs_list.html~
	templates/loggedin.html~
	templates/myleave.html~
	templates/myprojects.html~
	templates/project_details.html~
	templates/salary_slip.html~
	templates/users_list.html~
	templates/usrleaves.html~
	templates/view_announcement.html~