Merge pull request #91 from gvn/master

gvn -> mozilla
[Issue #88] Disable tile links on edit mode
Merge pull request #93 from daleee/master

[Issue #88] Disable tile links on edit mode
Merge branch 'master' of https://github.com/mozilla/webmaker-profile into persistimg

Conflicts:
	_fe/js/tiles.js