Merge pull request #36 from artur-polcode/master

Updating with recent master branch changes
#9963 - Added French translation
Merge branch '10581Pricing' into dev

Conflicts:
	app/design/frontend/default/greenlights/template/page/html/top_main_menu.phtml