implemented redundant search data in the model to improve search performance.
Implemented custom activity_manager to support searching on ORM level.
Modified parser and deleter to support the new search data.
Created unit tests for activity_manager
added OIPA/static-root to .gitignore because this is a generated folder
implemented redundant search data in the model to improve search performance.
Implemented custom activity_manager to support searching on ORM level.
Modified parser and deleter to support the new search data.
Created unit tests for activity_manager
added OIPA/static-root to .gitignore because this is a generated folder
some fixes in parser
added functionality to filer on years
implemented improved search in the v3 api.
modified NoCountPaginator to only exclude count when requested by using the count=false param.

Conflicts:
	OIPA/api/v3/resources/activity_list_resources.py
implemented NoCountPaginator
Merge branch 'master' of https://github.com/openaid-IATI/OIPA
added OtherIdentifierResource to ActivityResource
implemented the option to select what fields to serialize by using the select_related parameter
added selectable fields to the metadata when using the select_related param.

Conflicts:
	OIPA/api/v3/resources/activity_view_resources.py
Merge branch 'master' of https://github.com/openaid-IATI/OIPA

Conflicts:
	OIPA/api/v3/resources/activity_view_resources.py
Merge branch 'master' of https://github.com/openaid-IATI/OIPA

Conflicts:
	OIPA/api/v3/resources/activity_list_resources.py
	OIPA/api/v3/resources/activity_view_resources.py
removed south from installed apps
changed reference to api_tools

Conflicts:
	OIPA/api/v3/resources/activity_list_resources.py
Merge branch 'master' of https://github.com/openaid-IATI/OIPA
fix for searching on iati_identifier

Conflicts:
	OIPA/iati/models.py
	OIPA/iati/parser.py
Merge branch 'master' of https://github.com/openaid-IATI/OIPA
renamed the select_related param to select_fields
Merge branch 'master' of https://github.com/openaid-IATI/OIPA
implemented django 1.7 feature Queryset.as_manager
fixed warning (1_6.W001) by specifying the test runner in settings.py