Merge pull request #82 from benadida/update-to-django-1.6

helios/templates/voters_upload.html

helios/templates/voters_upload_confirm.html

helios/tests.py

helios/urls.py

helios/view_utils.py

helios/views.py

helios_auth/auth_systems/facebookclient/__init__.py

...auth_systems/facebookclient/djangofb/default_app/views.py

helios_auth/auth_systems/google.py

helios_auth/auth_systems/openid/util.py

helios_auth/auth_systems/openid/view_helpers.py

helios_auth/jsonfield.py

helios_auth/security/__init__.py

helios_auth/templates/index.html

helios_auth/templates/login_box.html

helios_auth/urls.py

helios_auth/utils.py

requirements.txt

server_ui/templates/base.html

server_ui/templates/confirm.html