fix for https://github.com/opencart/opencart/issues/1096
minor css changes
Fixed the variable for trial frequency check in the profile_form.tpl
Merge remote-tracking branch 'upstream/master'
Merge recent changes from opencart/master