Merge branch 'release/0.0.2'
Merge branch 'release/0.1.0'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'release/v1.0.2'
add queue locking and some minor bug fixes, also update capistrano deployment