Merge branch 'develop' of github.com:snwfog/whm_fsts into develop

Conflicts:
	index.php
Merge branch 'develop' of github.com:snwfog/whm_fsts into develop