separated app and server; move django files down one directory
Merge branch 'master' of github.com:leeonlee/umd
move requirements down one directory