django 1.7
Merge branch 'master' of https://github.com/nutztherookie/ibm_db_django

Conflicts:
	ibm_db_django/schemaEditor.py