django-1.5 compability
Merge branch 'master' of git://github.com/ostrovok-team/django-import-excel into ostrovok-team-master

Conflicts:
	import_excel/forms.py
	import_excel/views.py