Merge branch 'develop' of github.com:ncwhale/nyaacat_template into develop
merge local modifys.