Merge branch 'qa' into development
lots of stuff for got to commit before leaving virgina
Merge branch 'development' into qa