Merge branch 'develop' into feature/CFD-159-Wiki_pages_Detail_view

Conflicts:
	.travis.yml
	capacity4more/modules/c4m/demo/c4m_demo_content/csv/node/wiki_page.csv
Merge branch 'feature/CFD-149-Group_dashboard_Header' into feature/CFD-159-Wiki_pages_Detail_view

Conflicts:
	capacity4more/modules/c4m/demo/c4m_demo_content/csv/node/wiki_page.csv
Overriding bootstrap book overrides.
Override book navigation and also how bootstrap handles it.
Merge branch 'develop' into feature/CFD-159-Wiki_pages_Detail_view
DS settings for WIKi detail page.
Book navigation adapted.
Test for wiki page.
test for wiki page detail
DS settings for wiki pages.
Query alter to allow unpublished wiki pages in book outline.
Add weight of elements back in a hook_ds_pre_render because they sometimes get lost.
Query alter to allow unpublished pages in a book.
Only first generation children should be expanded in navigation.
Merge branch 'develop' into feature/CFD-159-Wiki_pages_Detail_view

Conflicts:
	capacity4more/themes/c4m/kapablo/sass/style.scss
	capacity4more/themes/c4m/kapablo/template.php
Check group_access before using it.
demo content to test level depth of wiki
Merge with develop + tests.
Migrate complains about missing dependency for migration of WIKI page comments but ht Wiki pages creation is there.
We add option --force to the migration, starting all migrations even if there is a so-called missing dependency.
Moved the check if the OG group has the group_access field to the generic function.
When in Group: don't show the book selector as we can only create pages within the current group.
Code cleanup.
Merge pull request #282 from capacity4dev/feature/CFD-159-Wiki_pages_Detail_view

CFD-159 + CFD-160 : wiki pages detail view + sidebar navigation
Merge branch 'develop' into feature/CFD-166-Theme_Discussion_Detail