Updated gitignore file with dev-env entries
Merge branch 'release/candidate' into develop

Fixed conflicts in .gitignore
Added Search field to OrganisationAdmin class

I think this should enable the search box to appear on the Organsiation
View in the Admin.

Need to validate to see where else the code might need to be changed.
Merge branch 'release/2.1.1' into develop
[Fix #48] Translation of sortable project list header labels

Replace the django-sorting "anchor" template tag with the tag
"tranlsate_anchor", adding translation of the label and a third optional
parameter to set sorting direction.
[Fix #92, fix #96] Move IATI ID to project funding page, remove dupes in
project partner list

The IATI activity ID was moved to the project funding page, but it was
forgotten on partner site. Fixed.

The list of partner organisations on the project main page of both RSR
and partner sites shows the same organisation multiple times if it has
multiple partnership roles in the project. This is fixed by using the
Project.partners many-to-many field rather than the
Partnership.partnerships related name.
Fix for Issue #94

This resolves the issue presented that the website field is not indexed
and so cannot be used in the search term. This has been removed so now
it should work - but you can only search on Name and Long_name.
Fix to issue #94 (2)

Extended the search options to project, project updates and project
comments. Need to see whether the indexing is present for all the
fields mentioned in the search - otherwise these will need to be taken
out or the index updated.
[Fix #65, fix #43] Use thumbs in large maps popups. Enable scroll wheel
zoom on large maps.

Add "extra_thumbnails" to Project.current_image and Organisation.logo and
define a "map_tumb" thumbnail to use in the popup windows on the large
maps showing all projects and organisations respectively.

Enable zooming using the mouse scroll wheel on the large maps.
Merge branch 'develop' of github.com:akvo/akvo-rsr into develop
[Fix #99, #48] Add sorting on location in partner sites project list

Also set sorting to "asc" and add translation to the same column on the
RSR project listing page.
Another fix to #94

Removed the unindexed items - I don't think they're necessary right now.

Also added search box to publishing status.
Fix to indentation error
First attempt at issue #101

Not entirely expecting this to work, but will give it a go and try
something else if not working.
Modification to #101

The tag for the translated portion was projectarticle but not mentioned
correctly in base.html - let's see if this works...
Another change for #101

Moved all into the single file - should help...
#101 again

Renamed the translation section to transarticle

The former had no id.
[Fix #91] Akvo administrators can view unpublished projects

Rename decorators.project_page() to
decorators.project_viewing_permissions.

Refactor decorators.project_viewing_permissions to not use the request
object for context passing.

Check if a user has the "rsr.change_project" permission and if so set
privileged_use to True. privileged_user is used to determine if the user
is allowed to view the project when it is unpublished, and also allows
the user to add updates.

Change the wording of the project draft view message.

Comment out unused context in views.projectmain()
Merge branch 'develop' of github.com:akvo/akvo-rsr into develop
[#91] Fix context variable bug in views.getwidget()

And a couple of minor edits.