commit
c
Merge branch 'master' of https://github.com/congtt/pj.ntk

Conflicts:
	ntk-info.php