TODO:
* Before you start working, YOU SHOULD UPDATE THE REPOSITORY on your local machine. With this we will avoid possible conflicts/solve conflicts imediately.

Label: R - Rok; D - Dominik

20.3.2012

-