rebased from origin/master
fixed includes and include pathes
Merge branch 'oleg-master' into mymaster

Conflicts:
	cpu/Makefile.include
	cpu/arm_common/arm_cpu.c