changed compiler
changed source dir
Merge branch 'master' into avr