only 2.1.2 travis testing for merge branch
fix to duplicate locations appearing for person - SYSMO-1647
log user agent with lograge
addressed some mergenotes - SYSMO-1638
updated text in locale for VLN access descriptions - SYSMO-1638
addressed some more mergenotes - SYSMO-1638
re-enabled validation of projects for acts_as_asset - SYSMO-1638

was removed at some point. Will see if the tests still work with it re-enabled
Revert "re-enabled validation of projects for acts_as_asset - SYSMO-1638"

This reverts commit 6c873730997383d2a893beca402e54c924e6bbd9.
use helper for consistent title on feedback page, and also reformatted
Controlling whether the recaptha is displayed

depends on the enabled setting, and also that the keys are setup. If it is enabled but not setup and exception is raised.
added a test for the recaptcha_setup? method
cleaned up the logic of the send_feedback and fixed the flash error msg
Added recaptcha settings to the admin 'others' page
Use stylesheet for padding for additional_settings
some minor refactoring and code tidying
travis bundler retry argument requires and =
minor tweak
reuse some predefined accessor methods to determine if somebody is logged in but not registered