Staff Appraisal
fix asset document
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/routes.rb
Merge remote-tracking branch 'upstream/master'

merging
Merge pull request #182 from Nurhashimah/master

Lesson Plan - Index(incl search) but pending rspec + Staff Attendance (f...
Merge pull request #183 from azimadnan/master

Staff Appraisal
Merge pull request #184 from irshad89/master

fix asset document
fixing merge errors
Merge pull request #185 from Nurhashimah/master

Lesson Plan - Show(revised), Edit(inc. plan approval), lesson report(inc...
Merge pull request #186 from Nurhashimah/master

#387 : Image buku yang telah dikemaskini tidak dipaparkan di Ogma App
staff leave list
Merge pull request #187 from irshad89/master

staff leave list
Staff appraisal index
staff appraisal index
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/routes.rb
Merge pull request #189 from azimadnan/master

Staff appraisal index page
maklumat perjawatan
Merge pull request #190 from irshad89/master

maklumat perjawatan
fixing merge errors AGAIN. rspec 1st people
Index Page - Student Discipline