Merge pull request #10 from audioscience/master

Pulling in upstream
Merge pull request #11 from audioscience/master

Pulling in upstream
Fixing get rx/tx ACMP state command

Was printing the wrong end station result
Updating OSX Makefile for file name changes
Fixing get_tx_state/connection dest mac command.

Was reading from the wrong structure.
Adding get_ command for the tx connection listener entity ID
Adding beginnings of state machine to read audio unit tree
Fixing stream port output descriptor type assert
Merge pull request #44 from denniszhuo/master

Updated lib
Merge branch 'master' of https://github.com/audioscience/avdecc-lib

Conflicts:
	controller/lib/src/end_station_imp.h
lib: inflight, change constructor initialization order to get rid of a warning
lib: util_imp, correct a compiler warning
linux: makefile update
lib: linux: init tx_pipe
lib: config descriptor, clarify lambda functions in add_or_replace_descriptor_and_sort() (requires C++11)
lib: linux acmp module rename to acmp_controller_state_machine
Merge pull request #46 from andrew-elder/master

cleanups
Merge pull request #45 from ajwlucas/master

Bug fixes and added beginning of audio unit descriptor tree read
controller:lib: Removed get_ prefix from descriptor class functions.
controller:lib: Fixed warnings and removed unused variables.