Merge pull request #373 from greezybacon/issue/lint

Satisfy lint test engine

Reviewed-By: Peter Rotich <peter@osticket.com>
Merge branch 'develop' into develop-next

Conflicts:
	include/class.ticket.php
Merge remote branch 'upstream/develop' into develop-next
Export custom fields with the ticket queue export

Also add in the user email address after the user name.

This patch also adds an ::export() method to the FormField() class which
allows a field to define how the data should be formatted when exported.