Staff Appraisal
Topicdetail - show, new+edit(pending destroy nested attr) + minor fixes on Exam & Examquestions(find:all)
merge conflict - application.js & application_helper.rb
Merge pull request #180 from Nurhashimah/master

Topicdetail - show, new+edit(pending destroy nested attr) + minor fixes ...
remove BADLY merged files
remove BADLY merged files
Lesson Plan - Index(incl search) but pending rspec + Staff Attendance (find(:all) revised)
Lesson Plan - Show(PDF & Edit/Approval links : pending), Index for Lesson Report List added
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
staff leave list