Merge remote-tracking branch 'upstream/develop' into develop
[gh-582] Whitespace
[gh-582] Remove mobile redirect stuff from unl bootstrap
Merge pull request #584 from erasmussen2/issue-582

Closes #582
Add .htaccess-subsite-map.txt to README reset script