Merge branch 'master' of git://github.com/pTricKg/web_dev
Merge branch 'master' of git://github.com/pTricKg/web_dev