Fixed filters style in the search page (Bootstrap 3).
Merge branch 'master' of github.com:GlobAllomeTree/GlobAllomeTree
updating settings for new 3.0 release of django cms
updtes for django cms 3.0
merged in django cms 3 updates
Makefile
adding in work done by Marco to work with normalized db structure