Merge branch 'release/0.1.1' into develop
fix for django 1.5
defaults has been removed in Django 1.6
Make url template tags forward compatible with Django 1.5
Updated CHANGES for release 0.1.2
Bumped to version 0.1.2
Merge branch 'release/0.1.2'