Backport fix for issue #1699
Fix issues #227 and #907
Backport security fixes
Bump version number to 2.1.3
Fix issue #1715
Really fix #1715
Correcting the breadcrumb in the 2.1.3 update instructions.
Fix language typo in Migrations library

lang and line were out of order
Merge pull request #1936 from etcgroup/2.1-stable

Bug in 2.1-stable - language typo in Migrations library
Error on line 1407 of db_active_rec.php traces to mis-named variables

Corrected variables to $k2 and $v2
Convert liefeeds to Unix style
Merge pull request #2021 from tomcode/linefeedsMigration

Linefeeds migration #2
Merge pull request #1969 from CoeusCC/patch-2

Error on line 1407 of db_active_rec.php traces to mis-named variables
Email library: htmlspecialchars for _header_str
Merge pull request #2337 from moi90/2.1-stable

Email library: htmlspecialchars for _header_str
Added small improvement to the _remove_evil_attributes function

Signed-off-by: brian978 <dbrian89@yahoo.com>
Signed-off-by: Wes Baker <wes@wesbaker.com>

Conflicts:
	system/core/Security.php
Updating User Guide for 2.1.4.
Revert "Updating User Guide for 2.1.4."

This reverts commit c5f99fdcc5c4a918b5b8fe3ddbd56ab25ad1c22b.

Signed-off-by: Wes Baker <wes@wesbaker.com>
Fixing a typo in the user guide.
Correcting URL for search box.