Creating template
Merge pull request #1 from team-sb/master

Accept projet setup changes.
Test with additional before_deploy step
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.
Merge branch 'master' of ssh://testing-bookwriter.rhcloud.com/~/git/testing into development

Conflicts:
	README.md
	config.ru
Copy database.yml already at build