housekeeping
Merge branch 'master' of github.com:roaringsheep/clawFront into queue