Move js
Include system layout
Remove layout
Add helper link
Merge remote-tracking branch 'remotes/origin/develop' into feature/move-system-js
Add postpurchase magic spaces
Merge branch 'develop' into feature/post-purchase-content
Fix for states
Merge branches
Merge branches
Merge remote-tracking branch 'remotes/origin/develop' into feature/move-system-js
Merge branch
Rename titles for template types
Remove space
Merge pull request #24 from seosamba/feature/rename-template-type-labels

Feature/rename template type labels
Merge branch 'develop' into feature/move-system-js

Conflicts:
	system/views/shipping.phtml
fix merge
fix styles
refactor product export
fix html for user accaunt form