Working on CampTrak integration and jquery for sales.
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	controllers/SaleController.php