added ticket
Ticket jframe
Merge branch 'Jordan'