Wimolta
Merge branch 'master' of https://github.com/pasakorn23/estudent.git

Conflicts:
	public/index.php
Merge branch 'master' of https://github.com/pasakorn23/estudent.git

Conflicts:
	public/index.php