Changed AMPQ server back to event machine
Merge branch 'development' of https://github.com/barterli/barterli_android into development