Move js
Include system layout
Remove layout
Add helper link
Merge remote-tracking branch 'remotes/origin/develop' into feature/move-system-js
Merge branches
Merge branches
Merge remote-tracking branch 'remotes/origin/develop' into feature/move-system-js
Merge branch
Merge branch 'develop' into feature/move-system-js

Conflicts:
	system/views/shipping.phtml
fix merge
fix styles
Merge remote-tracking branch 'remotes/origin/develop' into feature/move-system-js
Merge pull request #16 from seosamba/feature/move-system-js

Feature/move system js