final update + "No position" bug fixed
Merge branch '10.12.2013' of https://github.com/AmelieA/M7011E into 10.12.2013