Merge branch 'master' of https://github.com/puttpotsawee/perdtye2

Conflicts:
	app/config/database.php