search for ngo articles
Merge branch 'develop' into feature-user-search
hopefully will fix travis again
Merge branch 'develop' into feature-user-search
Fix bugs
Fix merge conflicts