django changes
screen resolution
Merge branch 'master' of http://github.com/pacco-leo/Pacco-test