Fixes database manager to not crash if the system is not up
(cherry picked from commit 9ce48552ea993360e4cd3a121884058c8e873ad5)
Fixes bad parsing of site title, etc.. when saving config, only occurred on installation [#931 state:resolved]
(cherry picked from commit 6fb2d2f6094ae402ec9997c05c98859e6886c48b)
Clear some of the caches on the final step of an install/upgrade, needed if we are switching to the bootstraptheme
(cherry picked from commit 001d39d8af54286ab32d857ffbc7741fc71d115b)
Fixes clicking checkbox/radio labels doesn't click control [#941 state:resolved responsible:dleffler]
(cherry picked from commit b13ac0de6e4474c241e5c6b0e609b687aaefade5)
Adds check for malformed control before registering to form to prevent crash
Fixes a date display issue during install/upgrade
Fixes base title assignment in photoalbum multi-upload
Should fix password reset not sending out emails [#955]
(cherry picked from commit fb1689d42622ea140659e2a4469eee0a4cdf99f4)
Changes some formatting/labeling on edit event, edit wysiwyg toolbar configuration, & html meta generator
(cherry picked from commit ef56cd3d4b75af394a0ddb65cfdc1505a0569190)
Sends user back to previous screen if edit_userpassword didn't send a user param (instead of display a message and continue with the change password view)
(cherry picked from commit 7211a1871ecb31bd9915544412c38b89ca62ee20)
Updates some calls to expVersion so we display the type and iteration during install and as page generator
(cherry picked from commit 2fd5d3d)
Fixes an issue where external navigation pages (links) would ALWAYS have the http:// tacked on
(cherry picked from commit b193e87bbcfd62afb8a42e3e966c76908ec9fc5f)
Update version reporting format during upgrade
Fixes some version stuff in prep for 2.1.4
Fixes problem of NOT properly upgrading navigation/page permissions when upgrading navigationmodule/controller
Cleaner fix to problem of NOT properly upgrading navigation/page permissions when upgrading navigationmodule/controller
Fixes some issues with pulled ical events
Fixes some issues with pulled ical events, esp with mixed time zones (event, server, etc...)
Merge branch 'develop' into feature/container2

Conflicts:
	CHANGELOG.md
	exponent_version.php
	framework/core/forms/form.php
	framework/core/subsystems/expSettings.php
	install/index.php
	install/upgrades/upgrade_navigation.php