Merge branch 'mj/import' into devel

mo/csv.py

mo/imports.py

mo/web/org.py

mo/web/org_contest.py

mo/web/org_place.py

mo/web/org_round.py

mo/web/table.py

mo/web/templates/doc_import.html

mo/web/templates/doc_import_judge.html

mo/web/templates/doc_import_proctor.html

mo/web/templates/org_contest.html

mo/web/templates/org_contest_list.html

mo/web/templates/org_generic_import.html

mo/web/templates/org_index.html

mo/web/templates/org_judge_import.html

mo/web/templates/org_proctor_import.html

mo/web/templates/org_round.html

mo/web/templates/org_round_import.html