YeoLab/flotilla — pull request #93 by olgabot (2014-08-21 00:11:55+00:00)
Title: Merge changes from dev

Getting ready for a release!