database.yml changed for production
renamed admissin file migration
production minifest change for angular router
added calendar.js
Added calendar.js
Merge branch 'master' of https://github.com/sri-sankl/manthan_erp
student hr refactored to student master and annual payment
clear pdcs
Rebased with master
Merge remote-tracking branch 'origin/master'
conflict resolve with new admissions
new admission added and merge coflicts resolved
initial commit muralee
TimeTables controller created
display grades in select control
added subject service
get subjectids in timetableform
subject and section masters created
grades master removed from my branch
deleted rename rename_payment_detail_id