Merge pull request #4 from SacNaturalFoods/master

changed Sum aggregate to Count and added Sum
My mistake
Merge pull request #6 from SacNaturalFoods/master

Looks good to me
implemented properties filtering and display
using STATIC_URL in template
Merge pull request #8 from ebertti/master

using STATIC_URL in templates
Fixed issue #7
Added BSD license
Fixed #9
Properties now show on root model on initial page load
Added save and continue to easy admin
Works with both vanilla admin and grappelli but method is crude -
it just runs javascript that deals with both cases
This will likely be a release to push to pypi as 1.5
Made template more friendly for extending
Added container prefix to css also for extending
Removed body tag since it wasn't anywhere close to valid html
anyway. If anyone has suggestions on making it nicer let me know.
You can extend the template, include it, or use as it and not care.
Added custom fields support but they don't do anything yet
Need to figure out a better way to add data to the values_list or
maybe not use values_list
Fixed #11
Removed support for properties in related fields.
Properties now work when m2m are present but the property
itself must be on the root model.
Fixed #11 again
Now works with order by
Merge branch 'master' of https://github.com/SacNaturalFoods/django-report-builder

Conflicts:
	report_builder/models.py
	report_builder/views.py

Did not merge views.report_to_list function until it can work with
m2m
Left debug stuff in template by accident
Removed slug field from ReportEditForm
Merge branch 'master' of https://github.com/SacNaturalFoods/django-report-builder

Conflicts:
	report_builder/views.py
Merge pull request #15 from SacNaturalFoods/master

completed the select box feature for search criteria with choice fields
If a filter errors, the a catch all expection will just filter it
off the report instead of 500. Not ideal but better than 500
Fixed #17
Allow blanks in choice fields
Updated version for pypi
merge