Move wiki app.
Merge branch 'master' into move-wiki
Merge branch 'master' into move-wiki
Merge branch 'master' into move-wiki
Merge branch 'master' into move-wiki
Fix Travis config after merge conflict.
Merge branch 'master' into move-wiki
Fix a stray import.
Reverted some accidental changes done in c5f827baf3b9dc3db949ff768bae4f8fc374f10b that broke some admin templates.
Merge pull request #6 from jezdez/move-wiki-admin-templates-fixes

Reverted some accidental changes done in c5f827baf3b9dc3db949ff768bae4f8...
Merge pull request #2585 from ubernostrum/move-wiki

Move wiki app.
Merge branch 'master' into bug1015590-scunthorpe-profile