Merge branch 'hotfix/2.1.0.2'
Merge branch 'release/2.1.1'
Make git ignore vagrant

Move Vagrantfile to Vagrantfile.template
Add Vagrantfile and .vagrant to gitignore
Merge branch 'release/2.1.2'
Update to release notes

Neutralising the tone and correcting the Perspective with some items from I to we.
Merge branch 'develop' of github.com:akvo/akvo-rsr into develop
[#135] Explicitly set urlconf in middleware.py

Use the set_urlconf() function from django/core/urlresolvers to set the
correct urls file for RSR and partner sites respectively.
[#135] Re-direct non-authenticated users to sign-in when adding an update

When accessing the project update form the user is now re-directed to
sign-in if not logged in. After signing in the user is returned to the
project update form.
[#135] Hide "Add update" button to non-connected users

On partner site project pages, when a user is logged in hide the "add
update" button if the user is not connected to the current project.
[#136] First cut of cacheback use for the API
[#136] Add pip requirements
Russian Translation #138

Adding the po file and the UI changes to templates for the Russian
Translation of RSR.
Still need to have the .mo files to be compiled.
[#138] Compile Russian translation.

Remove *.mo from .gitignore
[#136] Code cleanup

Rewrite convoluted resource name lookup for map template tag, needs
refactoring some day tho...

Make all jQuery calls to the API cachable.

Remove un-needed map ID parameter in map tempalte tag.

Fixes to google maps options.

Formatting fixes.
Merge branch 'develop' of github.com:akvo/akvo-rsr into develop
To cache the serialized result of an API request we need to intercept
earlier in the cycle to look in the cache and if we don't find anything
run through most of the code that used to be in Resource.get_list() in
CachedResourceJob.fetch().

Change memcached binding library to pylibmc. This requires
libmemcached-dev.

Conflicts:

	scripts/deployment/pip/requirements/2_rsr.txt
[#101] Experimental tabs using jquery-ui builder

Upgrade jQuery and jQueryUI to current versions to see if google
translate works better
Change memcached python library
[#120] Allow donations to fully fund projects

Add Project.amount_needed_to_fully_fund_via_paypal() and
Project.amount_needed_to_fully_fund_via_ideal() that calculate how
large a donation is needed to fully fund the project when transaction
fees are included

Add settings for the transaction fee calculations

Add text to donation form page that tells the user how much is needed
to fully fund the project including projected transaction fees using
the methods above

Change the validation to allow for the "overfunding" above

Fixes related to the switch of memcached library
[#120] Bugfix to MOLLIE_FEE_BASE setting

Re-naming of setting wasn't done everywhere