finally starting to upgrade to Django 1.4.
Merge branch 'master' into develop
updated Django version, replaced PIL with Pillow.
Merge branch 'master' into develop
updated requirements
updated requirements.
Merge branch 'develop'