Merge branch 'master' of github.com:CGCookie/CGC-Post-Types into dev
cleaned up software version tax registration
Merge branch 'dev' of github.com:CGCookie/CGC-Post-Types into dev
Merge branch 'refs/heads/master' into dev
fix connection to quizzes