Merge pull request #155 from FellowTraveler/develop

Fix for Android version, for Pete.
Update Doxyfile
Merge pull request #156 from lclc/develop

Update Doxyfile
fix zmq2 name in config
only compile zmq4 if needed
Merge pull request #157 from da2ce7/zmq4

ZMQ config fix