fix merge conflict
Merge branch 'tiles'
fixing merge problem with home.js
Merge branch 'tiles'