upd
Merge branch 'master' of https://github.com/sh0ked/djpro