closes 178 Update jQuery to 2.1
closes #179 Update Marionette to 1.5+
Merge branch 'release/2.0.0' into feature/Paz

Conflicts:
	app/webroot/dist/main.js
fixes marionette 1.3 changes
Merge branch 'fix-shoutbox' into release/2.0.0
Merge branch 'release/2.0.0' into feature/Paz

Conflicts:
	app/webroot/dist/main.js
more paz theming
updates users/index layout and i10n
Merge branch 'release/2.0.0' into feature/Paz

Conflicts:
	app/View/Themed/Default/webroot/css/stylesheets/styles.css
	app/View/Users/index.ctp