merge everything (except for manual)

[mabre]

As the attendance rate was quite low (pöses Mitarbeiter - fercht sie auf den Poden), here the plan for merging our code dev branches:

• Master into Milestone9
• Fix and improve into items
• items into milestone9 then continue development on milestone9

[Kegny]

Don't forget about "HeartBeat" and "animation".

[mabre]

Merge is done. Didn’t “HeartBeat” and “animation” (they are not stable and easy to merge later).