버튼 아이콘 변경 및 glyphicons 추가
Merge branch 'master' of https://github.com/importre/paintover

Conflicts:
	src/manifest.json
Merge branch 'master' of https://github.com/importre/paintover