Refactor template settings
Layout templates in rows of four
Merge branch 'james_tmp'
Remove console.log debug line
Merge branch 'master' of github.com:sharelatex/web-sharelatex