hgfd
Merge branch 'master' of https://github.com/yakasan/SuperComics

Conflicts:
	view/create.tpl
Merge branch 'master' of https://github.com/yakasan/SuperComics
modjv