Changes made by Chavdar Tsvetkov (aftoafto@live.com).
Merge branch 'master' of https://github.com/RadvachTsvetkov/AppBuilder.git