dfad
update by david
UPDATE BY DAVID
Merge branch 'master' of https://github.com/davidHuanghw/ZZJZ

Conflicts:
	.gitignore
	Lib/Action/Admin/JnpAction.class.php
	Lib/Action/Portal/JnpAction.class.php
	Lib/Model/JnpModel.class.php
	Tpl/Admin/Jnp/editJnp.html
	Tpl/Admin/Jnp/index.html
	Tpl/Portal/Jnp/gallery.html
	Tpl/Portal/Staff/viewStaff.html
	index.php
update by david