upload.phpの修正
upload.phpの修正
Merge branch 'master' of https://github.com/richmedia-jp/y-kino

Conflicts:
	html/beauty_salon/config.php
	html/beauty_salon/edit.php
	html/beauty_salon/upload.php
	html/beauty_salon/views/view.php