updating from shibuhouse server for some files
Merge branch 'master' of https://github.com/ayafujiaya/shibuhouse_new_web

Conflicts:
	acmailer3