Conflicts:
	include/class.ticket.php

File size limit

Issue/476

Issue/475

Make sure ticket api controller enforces attachments settings (don't trust data parsers).

Fix minor spacing/formatting issues.

Don't show reply/response section on new ticket form if the staff can NOT post replies... also checked in Ticket::open().

Add method to sanitize rich/html text. Addd html encode/decode methods. Remove html encode on display (encoded text saved in db)

Fully implement thread entry class and types (Note, Message & Response)

Remove default max limit - no size limit is assumed.

Show assigned to column based on flag - which now factors in if assigned tickets are being shown on open queue.

 -> Open - only contains unasssined tickets if 'show assigned tickets' is off.

Update copyright (c) to 2013!

Tickets count preview - search links.

Use minimized version of css.

Please wait... 

Discard warning on ticket view page.

Add dept to ticket's sort options

Due dates + SLA 

Add nested help topics support to the knowledge base

Feature/api revisited

Support inline attachments *import*