format pep8
Merge branch 'v2' of github.com:vfasky/QcoreCMS into v2