null error on activity page fixed
Merge branch 'coconut-drupal' of https://github.com/ICTatRTI/coconut into coconut-drupal