Merge branch 'devel'

.gitignore

mo/contests.py

mo/imports.py

mo/users.py

mo/web/fields.py

mo/web/org_contest.py

mo/web/org_round.py

mo/web/org_users.py

mo/web/templates/doc_import.html

mo/web/templates/doc_org.html

mo/web/templates/org_contestants_import.html

mo/web/templates/org_org.html

mo/web/user.py