Use dev version for CKEditor
Merge branch 'master' of github.com:obiba/mica
Add bootstrap subtheme
Add 3rd column for network studies
Merge branch 'master' of github.com:obiba/mica

Conflicts:
	src/main/drupal/profiles/mica_distribution/drupal-org.make