Merge pull request #1 from rescuedcode/more_staffplan_index_stuff

More staffplan index stuff
Merge branch 'master' into more_staffplan_index_stuff