added photo grid view markup
modify Gruntfile.js
merge conflicts