Fixed warnings of unchecked code
Merge remote-tracking branch 'upstream/master' into fixes
fixed CastException when equipping items
Added view during battles
Merge branch 'paddatrapper-fixes'