Merge pull request #727 from nerdis/master

action a todo in inv + fix ValueError in inv_rheader
S3search removal modification for tests
Merge pull request #728 from arnavsharma93/master

S3search removal modification for tests
UVG: low-fi colors
Merge branch 'master' of git://github.com/flavour/eden
pr_search_ac shows HR details (can be disabled); Fixes for s3theme; Person
deduplication uses Middle Name as well; Training Participant Imports can
specify People by Middle Name, DoB &/or National ID to help with ensuring
correct matches amongst many similar names; Cleanups for search removal
Merge branch 'master' of git://github.com/flavour/eden
Fix person_deduplicate, make variable names in s3theme consistent again
Fix themes selector in custom project form.
Minify, IFRC: tweak Project Themes list
Bugfix LocationSelectorWidget2 when a point out of bounds is selected
Use inline-add form in summary configs in CRMT, MCOP and Yolanda templates.
Merge branch 'master' of git://github.com/nursix/eden
LocationSelector geocodei should happen when lowest-possible Lx selected
not just lowest-visible. NYC: Apply Fac LocationSelctor customisations in
org_organisation component too.
settings.custom_configure_my_resource
Deprecate SiteAddressAutocomplete but replicate this within
SiteAutocomplete
Merge branch 'master' of git://github.com/nursix/eden
Fix bug #1517: add incident to an event
iNYC: Don't assume Contacts created by user from same site, AC case caught
fugbix