Adding unicode, before mark_safe, for Django 1.5
Merge branch 'master' of https://github.com/dummas/django-ajaximage into dummas-master

Conflicts:
	ajaximage/widgets.py