Merge branch 'My-Branch' of https://github.com/SatoshiNishishita/kiso_mobile_guide into My-Branch

Conflicts:
	dbconnect.php
2014/12/01/21:00
2014/12/01/21:00