second update
Merge branch 'master' of https://github.com/sampanit/sampan

Conflicts:
	index.php