manually merged changed from master branch
updated FW/1 to version 2.1
Added changelog
removed username field (email address used for login)
updated to latest versions of jQuery and jQueryUI
Updated to version 2.2.2 of Bootstrap
updated ARIA landmark roles
updated FW/1 to version 2.1.1
Railo fix and support for basic support for changing subsystemDelimiter
security redirect
Merge pull request #112 from aliaspooryorik/develop

Develop
release preparation
Xindi release