Merge branch 'develop'
Missing include in MonarchInfo.cpp
Merge branch 'master' into develop
Updated libthorax (develop branch; adding u1084a digitizer info)