ebbinger413/wrktkt — pull request #1 by ebbinger413 (2014-04-15 19:59:01+00:00)
Title: Staging - rebase

Rebase staging to match master for new development workflow.