edit beberapa hal
Merge branch 'master' of https://github.com/aerlaut/NPHost

Conflicts:
	templates/view-org.html