Merge branch 'master' of github.com:lukebpotato/djangae-testapp
Update djangae