Further refactoring, movement toward external plugins
* Completed work on the Great Asset Refactoring. Assets are now pushed with an explicit 'when' argument, currently either 'always' or 'user'. Assets pushed with 'user' are sent only when a user is logged in (req.user is defined)
* Committed the latest versions of our in-house jquery plugins and a script we can use to update them when needed; other devs don't run that, we use it to maintain the module and then commit them as normal for simplicity from other devs' standpoint
Merge branch 'master' of github.com:punkave/apostrophe

Conflicts:
	public/css/editor.less
	public/js/content.js