fix ngo view issues
Merge branch 'master' of https://github.com/mikaelvg/bayanihan