PR of work on Django merged#28

tobias-loew wants to merge 12 commits into

cierelabs:developcierelabs/boostache:developfrom

tobias-loew:django-mergedtobias-loew/boostache:django-mergedCopy head branch name to clipboard