merged from dev/master
Resolved TicketController suppression - updated hci.php
Resolved PrintingTypesSeeder suppression
Resolved conflict from merge dev/master
fixed integrity violation on GenresTableSeeder
Merge branch 'dev/master'
Adding the withTrashed method on Models
Merge branch 'dev/master' into dev/trashed
Added withTrashed on Models
resolved conflicts from dev/master
Merge branch 'master' into dev/trashed
Finished adding the withTrashed method
Updated withTrashed on Event