Renamed api blueprint to apiary.apib
Minor change
Merge branch 'develop' of github.com:dreamiurg/whisper into develop

Conflicts: