merged
Merge branch 'develop' of https://github.com/cedadev/djcharme into develop
stuff for suggest