Remove any characters after the version number

This was needed, as it was "1.5.6-r2"
Include libraries in hardware add-ons

Also gather all architecture subdirectories
Merge branch 'master' into master-remote

Conflicts:
	_Makefile.master