make this fancier. still needs proposed vs. planned
Merge branch 'master' into more_staffplan_index_stuff
Tweaked some CSS. Added the totals for assignments on staffplans#index.
Implement the proper initial sort for the staffplans index, the upcoming work load for an active, enableduser.
No need to calculate the estimated/actual totals on the client, we're already getting it from the server!
Adding basic sort capabilities. Needs cleanup/styling. Turning to individual staffplans now.
Merge pull request #2 from rescuedcode/more_staffplan_index_stuff

More staffplan index stuff
client and project creation tests passing
merged feature test branch into invites
Getting invites up to date with master, to merge it back into master.
Merge branch 'master' into invites
Pulled latest master, merging to be up to date
Merge branch 'master' into invites