Merge branch 'release/0.1.4' into develop
Merge branch 'hotfix/fix_decorator' into develop
version number
Now accepts dicts and lists as modifiers
bumped version
Fixed enormous bug
First attempt at serializing fks
Fixed extra/django layout and bumped version
fixed conflicts