removed user_test omniauth test until its fixed with guard
adjust add_goal view
fixed merge conflict in test_helper
Merge branch 'staging' into api_specific_forms
styled add goal page