added dajax support
Merge remote-tracking branch 'origin/master'

Conflicts:
	djsocial_notifications/tests.py
Merge remote-tracking branch 'origin/master'
added dajax support