Development

Merge bugHerd updates into master