Fixing errors from missing variables.
Merge branch 'master' of https://github.com/Jacketpages/Jacketpages

Conflicts:
	app/Controller/BillsController.php