hoge
Merge branch 'master' of ssh://github.com/ymatsuza/technology

Conflicts:
	fuelphp-1.5.3/fuel/app/classes/model/post.php
	fuelphp-1.5.3/fuel/app/config/development/db.php