Add base translate
Merge branch 'feature-translate' into feature-translate-page

* feature-translate:
  Add base translate

Conflicts:
	src/Application/Bundle/DefaultBundle/Resources/views/Default/promotion_apps.html.twig
Fixed translate
Add file translate for promotion
Merge remote-tracking branch 'remotes/stfalcon/master' into feature-translate-page

* remotes/stfalcon/master:
  disable disqus comments for development servers
  Change template email for order mobile application
  Change mail
  Fixed style
  Fixed style
  Hot fix move to header code analytics
Add messages
Add scripts
Change views
Change parameters
Merge pull request #153 from bolotyuh/feature-translate-page

Feature translate page
Fixed subject
contact form and form styles
Merge remote-tracking branch 'remotes/tolya/19675_contact_form' into 19676_feature_contact_form

Conflicts:
	src/Application/Bundle/DefaultBundle/Resources/views/Default/contacts.html.twig
Merge pull request #154 from bolotyuh/feature-fixed-subject-email

Fixed subject
added markup on direct order form
Merge remote-tracking branch 'remotes/stfalcon/master' into 19676_feature_contact_form
Move marketing code in footer and added checking for prod server host for enable analytics