Merge branch 'release/v0.6.0' into develop
Merge branch 'master' into develop
Added time.sleep(1) to mutex exception on recurssion
added south migrations
bumped version
Merge branch 'release/0.6.1'