to merge
Merge branch 'master' of github:manueljelinek/raspberry-pi

Conflicts:
	console/source/main.c
	console/source/shell.c