Merge branch 'master', remote-tracking branch 'origin'
Staffrecruit rc
conflict in schema
Today Attendance
food_wastages and conflicts in canteen
date issue in food_wastage
approval cycle mail pending
approval cycle
mail in approvals
staffrecruits/form
context detector
Merge remote-tracking branch 'origin/admission_new'
conflict resolve
conflict resolve
parent view added to hrm
full_calendar-rails version to 1.6.1.0
Teacher Grade Mappings Rework