kewpa18 19
Merge pull request #103 from irshad89/master

kewpa18 19
Merge pull request #104 from Nurhashimah/master

Rescue for examquestion - 'diagram_caption' field added.
changes
manual merge
Application Update
Update Annotation
rspec staff
rspec Updates
layout positions
asset pages rspec update
factories for inventory vs fixed asset
rspec for asset buttons
rspec for kewpa links
fix date
Merge pull request #105 from irshad89/master

fix date
Defect Report New Form with tests
Merge branch 'master' of https://github.com/maxcobmara/ogma
asset controller code cleanup
asset defect new now works