making tests run with 1.6
Merge branch 'develop' into feature/issue-10-upgrade-to-django-1.6

Conflicts:
	txtalert/apps/api/tests.py
	txtalert/apps/api/urls.py
Merge branch 'feature/issue-10-upgrade-to-django-1.6' into develop