Creating template
Merge branch 'master' of ssh://forum-7o2ukkt6v.rhcloud.com/~/git/forum

Conflicts:
	.openshift/cron/README.cron
Updated to 3.0.12