#7 Add rake dev:setup
Merge remote-tracking branch 'origin/develop' into develop