Merge branch 'hotfix/v1.0.4'
auto-determine search_id using the last segment if a search_id is not provided via param
Merge branch 'master' into develop
add secure_action and secure_return params to form
Merge branch 'hotfix/https'
Merge branch 'master' into develop

Conflicts:
	system/expressionengine/third_party/dynamo/mod.dynamo.php
Merge branch 'develop' of github.com:rsanchez/dynamo into develop