Using Aviary as EditActivity
Merge remote-tracking branch 'origin/master'