Version 2.3
Merge branch 'master' of https://github.com/iantearle/Expanse-CMS-Public

Conflicts:
	expanse/css/admin.css
	expanse/css/bootstrap.css
	expanse/css/expanse.css.php
	expanse/css/expanse.js.css
	expanse/css/global.css
	expanse/css/module.css
	expanse/edit.php
	expanse/funcs/admin/categories.php
	expanse/funcs/admin/dbcnx.php
	expanse/funcs/admin/menu_builder.php
	expanse/funcs/admin/prefs.php
	expanse/funcs/admin/theme_editor.php
	expanse/funcs/admin/users.php
	expanse/funcs/class.auth.php
	expanse/funcs/class.comment.php
	expanse/funcs/class.contact.php
	expanse/funcs/class.expanse.php
	expanse/funcs/class.output.php
	expanse/funcs/common.functions.php
	expanse/funcs/common.vars.php
	expanse/funcs/format.php
	expanse/funcs/functions.php
	expanse/funcs/home.php
	expanse/funcs/lexicon/en_us.php
	expanse/funcs/message.php
	expanse/funcs/misc/installmailer.tpl.html
	expanse/funcs/schema.sql.php
	expanse/funcs/template.functions.php
	expanse/funcs/upgrade.functions.php
	expanse/funcs/varsdef.php
	expanse/javascript/backbone.min.js
	expanse/javascript/expanse.js.php
	expanse/javascript/expanse.main.js
	expanse/javascript/ios.js
	expanse/main.php
	expanse/modules/blog/view.php
	expanse/modules/events/bootstrap-datepicker.js
	expanse/modules/events/view.php
	expanse/modules/gallery/controller.php
	expanse/modules/gallery/view.php
	expanse/modules/links/controller.php
	expanse/modules/links/view.php
	expanse/modules/pages/controller.php
	expanse/modules/pages/view.php
	expanse/modules/press/controller.php
	expanse/modules/press/view.php