Merge branch 'master', remote-tracking branch 'origin'
Staffrecruit rc
time table rework
conflict in schema
Today Attendance
staffrecruits/form
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
rails_12_factor gem added
Teacher Time Table
Merge remote-tracking branch 'origin/academics_changes'
faculty in hrm first cut
issues in canteen