Creating template
Merge ssh://livenote-theoctal.rhcloud.com/~/git/livenote

Conflicts:
	.openshift/action_hooks/README.md
	.openshift/cron/README.cron
	README.md
	index.html
	package.json