static content added, CSS files cleaned up and a few small styles adjusted
Merge remote-tracking branch 'origin/master' into risk_assessment_activity_feed_kc
fixed merge conflicts
fixed merge conflicts