Removing redundant expressions
Merge branch 'hrmodule' into leave_application

Conflicts:
	lib/calendar_api.rb