update laptop 10/10
Merge branch 'master' of https://github.com/fortislogo/petacoffee
update laptop 10/10
Conflicts:
	catalog/controller/account/recurring.php
	catalog/view/theme/fortuna/template/account/recurring_form.tpl
	system/cache/cache.country.status.1380651714
	system/cache/cache.country.status.1380656243
	system/cache/cache.country.status.1381342787
	system/logs/error.txt