Work on #3
Work on #3
additional fixes for #3 mostly related to Django 1.5.x
Merge branch 'master' into feature/3-aggregator
update descriptors to RapidSMS
Merge branch 'feature/3-aggregator'