Merge pull request #1 from aqeelb/Development

Development
Merge remote-tracking branch 'origin/Development'
Merge remote-tracking branch 'origin/Development'
Merge remote-tracking branch 'origin/Development'
Merge remote-tracking branch 'origin/Development'
Make scrollbar appear on Desktop mode

- Divide photogrid on desktops to 6+6