Merge branch 'develop'
update version
Merge branch 'release/0.5'
remove dup req extension
Merge branch 'hotfix/correct_extension_import'
django-extensions to 1.3.5
enhance logging and reconnect, heartbeat to own module
add disactivate
release 0.5.2
Merge branch 'release/0.5.2'
fix not null constraint on last_beat
Merge branch 'hotfix/last_beat_violates_not-null_constraint'