Do not track .idea/dataSources.ids
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	.idea/dataSources.ids
Generate resource book with title and description.