reset support for additional controls
Merge pull request #123 from libis/reset_advance_search

reset support for additional controls
NOJIRA Implemented more reliable way to extract IPTC metadata from images for both GraphicksMagick and ImageMagick (CLI versions)
NOJIRA backport caProcessTemplateForIDs() fixes
Merge branch 'master' into master-fix
NOJIRA Now prevent usage of wysiwyg editor in search forms
Merge branch 'master-fix' into develop

Conflicts:
	app/helpers/displayHelpers.php
	themes/default/views/find/Search/search_advanced_form_html.php