Renaming ...
Merge branch 'master' of https://github.com/Smart-Minotaur/nxt_minotaur

Conflicts:
	src/nxt_beagle/CMakeLists.txt