moving templates to usr

moving templates to usr

Conflicts:
	cartridges/openshift-origin-cartridge-ruby/bin/setup
Merge pull request #2346 from danmcp/master

Merged by openshift-bot