...
...
Merge branch 'master' into issue_4_6_7

Conflicts:
	controllers/main.coffee
	gyazz.coffee
	models/attr.coffee
shokai修正を反映