Merge branch 'integration' of https://github.com/onepercentclub/bluebottle into integration
Merge branch 'integration' of https://github.com/onepercentclub/bluebottle into integration
task activity file uploads
Merge branch 'integration' of https://github.com/onepercentclub/bluebottle into integration
null
Merge branch 'integration' of https://github.com/onepercentclub/bluebottle into integration
added zoom to markers funcitonality to the maps component
added clustering styling to maps component
moved profile and account controller funcs to booking extension
moved header label to own block verbatim
Merge pull request #171 from aethemba/integration

Integration
Modified placeholders in task create
Merge pull request #172 from jakoblaegdsmand/integration

Integration
Merge pull request #174 from sergei-maertens/integration

Modified placeholders in task create
Updated dependencies to resolve issue with custom user model and django-admin-tools
Moved some templates over
Show in admin list which pages are in full screen
css issues
Merge pull request #175 from sergei-maertens/integration

Updated dependencies to resolve issue with custom user model and django-...
Merge pull request #176 from gannetson/integration

Integration