merge 01.11.2013
Merge branch 'master' of https://github.com/CodeVillain/trial