Commit 20.11.2013
Commit 20.11.2013
Merge branch 'master' of https://github.com/inz2013/project_code