Merge pull request #1 from randompherret/dev

6/8/14 requests
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
fix snow time sheets and add descriptions
Merge branch 'master' into dev