Updating version number and release date for 2.1.1
Updated downloads page in docs to increment versions
Revert from() alias escaping fix - it was breaking more stuff
Fixed conflicts between git flow 2.1.1 and non-flow 2.1.1
Switch strstr() arguments
Revert a preg_replace()
Updating XSS cleaning to better handle base64 encoded attributes.

Conflicts:
	system/core/Security.php
Bumping version number to 2.1.2.
Fix issue #1543
Backport CI_Config::load() optimization from pull #1571
Alter CI_DB_pdo_result::num_rows()
Backport fix for issue #1314
Change is_loaded() to return a reference
Fix warning by profiler when userdata has objects

If session data has objects and profiler is enabled, a warning is trown:

> A PHP Error was encountered
> Severity: Warning
> Message: htmlspecialchars() expects parameter 1 to be string, object given
> Filename: libraries/Profiler.php
> Line Number: 514
Merge pull request #1675 from Dentxinho/patch-1

Fix warning by profiler when userdata has objects
Style fix and changelog entry for pull #1675
Backport a fix for oci8_result::num_rows()
Backport fix for issue #1699
Fix issues #227 and #907
Backport security fixes