Grid layout update
Grid css clean up
Asset code clean up
Index php update
Add environment for deploy
Merge remote-tracking branch 'upstream/develop' into develop