Merge pull request #175 from azimadnan/master

sync a fork
Fixed-break on routes
fix borang maklumat staff
Merge pull request #177 from irshad89/master

fix borang maklumat staff
Merge pull request #176 from Nurhashimah/master

Fixed-break on routes
staff edit form tabs initial
staff edit page
update staff information form main
update repeating fields for staff
conflict merge
staff edit no errors
updated staff form
update asset
Merge pull request #179 from irshad89/master

update asset
update layout for tabs in staff form
Merge branch 'master' of https://github.com/maxcobmara/ogma
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