moved phy_megamerge to c++11 section (because it didn't compile on osx...)
Merge branch 'master' of https://github.com/sim82/papara_nt