updates
Merge branch 'master' of github.com:BRO-FHV/Hal into feature/uart

Conflicts:
	basic.h