Merged changes and fixed some bugs with deleting goals that came from the new activitydiv class
Merged changes and fixed a delete goal bug that came from the new activitydiv class