Migrating Django 1.3 to 1.6
Merge branch 'master' of github.com:trivago-ggarrido/photoDiary