Creating template
Merge branch 'master' of ssh://cc-rgsoc.rhcloud.com/~/git/cc

Conflicts:
	README.md
	config.ru
remove openshift
set fallback for assets in production
add migration runner to initializers
add cf manifest