Core: refactoring of AForm class.
Storefront: changed contact-us page related to AForm changes.
Merge remote-tracking branch 'origin/1.1.8' into 1.1.8