Creating template
Merge branch 'master' of ssh://testing-bookwriter.rhcloud.com/~/git/testing into development

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