Removed unnecessary code from resolver.
Merge pull request #351 from oliverschmidt/master

Removed unnecessary code from resolver.
Allow text screen memory to be aligned to 0x2000.
Merge pull request #356 from oliverschmidt/master

Allow text screen memory to be aligned to 0x2000.
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/chuljin/contiki-arduino-propeller