0.3.0
Merge branch 'develop' into release/0.3.0
Rearrange order of Aviary tools.
Merge branch 'release/0.3.0' into develop