Merge branch 'hotfix/2.1.5.2'
[#263] Replaced mini-CMS routing with routing for interim home page.
Merge branch 'feature/rsr_subdomain' of github.com:akvo/akvo-rsr into feature/interim_home_page

Conflicts resolved in:
	akvo/templates/partner_sites/auth/sign-in.html
	akvo/urls/rsr.py
[#263] Changes to allow RSR to be deployed on a non-root app path.
[#139] Removed obsolete /api URL pattern using django-piston.
[#139, #263] Changed / redirections to /home when on rsr.akvo.org.
The web server routing config in turn redirects this to the akvo.org server.
[#139] Removed the FORCE_SCRIPT_NAME setting.
We won't need this when RSR is on the rsr.akvo.org subdomain.
[#139, #263] Changed the index page link from with RSR to /home to ensure the subdomain can route back to the home page domain correctly.
[#263] Changed Akvopedia link in base.html template from /wiki to http://akvopedia.org.
Merge branch 'develop' of https://github.com/akvo/akvo-rsr into develop
[fixes #177] Removing rosetta as a dependency
Merge branch 'develop' of https://github.com/akvo/akvo-rsr into develop
Merge branch 'feature/interim_home_page' of github.com:akvo/akvo-rsr into develop

Resolved merge conflict in:
	akvo/templates/partner_sites/auth/sign-in.html
Fixing gitmodules URL to include .git suffix
[refs #177] Removing rosetta from the requirements too
Merge branch 'develop' of github.com:akvo/akvo-rsr into develop
[#263] Added cron config and scripts for updating home page data and blog feed.
[#263] Added missing server subdomain parameter for home page cron jobs.
[#139, #263] Added Apache config files for test servers.
Revised the subdomain routing and added bot denial config.
Merge branch 'feature/interim_home_page' of github.com:akvo/akvo-rsr into develop