integration with aquarium: Progress III & merge master
Refs: #1824
Configurable captcha options
Include additional settings in sample .conf file
Updated default snf-common conf file
Default settings configuration file