changed graph color
changed chart colors and made dynamic
fixed conflicts
Merged master and branch
Merge branch 'master' into steve_funding_methods
cleaned more views
styles
fixed conflicts in stylesheet