Widget template updated to handle the case where {{form.media}} is rendered after its associated form
Merge pull request #1 from riklaunim/master

Get improvements from the lastest version
fixed problems with django 1.6
updated version and fixed django version
Merge pull request #99 from shomodj/master

fixed problems with django 1.6
Pull changes from riklaunim/django-ckeditor.
Merge pull request #82 from ellmetha/master

Init the editor when the DOM is fully loaded if CKEDITOR is not defined
Update utils.py

Bug fix when file extension is uppercase
Merge branch 'master' of git://github.com/shaunsephton/django-ckeditor into shaunsephton-master

Conflicts:
	CHANGELOG.rst
	ckeditor/image/dummy_backend.py
	ckeditor/image/pillow_backend.py
	ckeditor/static/ckeditor/ckeditor/skins/moono/dialog.css
	ckeditor/templates/browse.html
	ckeditor/utils.py
	ckeditor/views.py
	ckeditor/widgets.py
	ckeditor_demo/settings.py
	ckeditor_demo_requirements.txt
	setup.py
	tox.ini
Fix an issue about reading files from user directory
Merge correct setup file
Update readme with latest code merges info.
Merge branch 'master' of https://github.com/shaunsephton/django-ckeditor
Merge pull request #105 from rgcarrasqueira/master

Problems with file that has extension in uppercase
Merge remote-tracking branch 'upstream/master'