Fixes a parameter issue with the file manager patch to prevent receiving garbage url debris on some servers

Conflicts:
	framework/modules/file/controllers/fileController.php
Corrects a styling problem w/ some login views
Makes blog aggregation tab more intuitive by hiding list of other blog module if the 'add_sources' checkbox is unchecked, also changes the phrase to 'segregate' instead of 'separate'
Fix copy form method to return to manage forms view
Updates changelogs for impending 2.1.3 release
Merge branch 'develop' into feature/container2

Conflicts:
	CHANGELOG.md
	framework/modules/file/controllers/fileController.php
Updates changelog, gets branch back on track w/ develop/2.1.3