:q
Merge branch 'develop' into feature/CakeResque

- develop and the first CakeResque implementation merged

Conflicts:
	app/View/Layouts/default.ctp
Removed debugkit
More work on the background jobs

- Started work on the exports
Most of the export caching done

- also a fair bit of refactoring of the code, fatter models, thinner controllers, component moved to Lib
Further work on the exports
Next version of exports done
Merge branch 'develop' into feature/CakeResque

Also, more work on the background jobs
- started work on publishing
- started making the background jobs an optional setting in bootstrap

Conflicts:
	app/Controller/AppController.php
	app/Controller/EventsController.php
Further work on the background jobs

- contact reporter now moved to the model
- backround job not implemented for it yet
Proposal changes Fixes #192

- Contextual comments for proposals
- shows proposal count in the top bar
- new view showing all of the events of the user's organisation with an active proposal
Preparing for the scheduled tasks

- incorporated cidr from develop
- some other improvements to the background jobs
Further work on the scheduled tasks

- Also some changes left off from the previous commit
Further work on the background jobs

- started work on scheduling
- view to add scheduled tasks (still needs work)
- moved cache job bulk-code to the job model from the controller
- bootstrap timepicker
More work on the background jobs

- added scheduler to the export caching
- site admins can set up the intervals of the automated caches, and the exact times at which they should be executed.
Small change to the tasks index

- removed script that after changes was basically a copy of another one
Work on the background job and the proposals

- Proposals now get synced on pull
- several bug fixes
- new startup script for the background workers
Several features

- Sync for background jobs (pull + push)
- more e-mailing delegated to background jobs
- A bunch of bug fixes and minor changes
Merge branch 'feature/CakeResque' into feature/test
Fix of a new pagination rule overwriting the rest allowing users to see more than they should
Some small fixes

- Corrected some weak notifications on background jobs
- Changed the view slightly to view background jobs
- fixed an issue where editing a sync server setting would cause an error due to the id not being passed to the logging plugin