alert fix for page permissions
Merge pull request #228 from innaDa/OrderHistoryAutoshipErrorFix

alert fix for page permissions
Merge pull request #229 from bjanish/sandbox

New homepage layout
Merge pull request #230 from bjanish/sandbox

CSS changes for rss reader
Remove console.logs
Merge pull request #231 from jerv13/master

Remove console.logs
Merge pull request #232 from bjanish/sandbox

New homepage layout
View fix
Merge remote-tracking branch 'upstream/master' into sandbox

Conflicts:
	RcmRotatingImage/view/rcm-rotating-image/plugin.phtml