Merge branch 'master' of ssh://dwinthecloud-dquenault.rhcloud.com/~/git/dwinthecloud

Conflicts:
	.openshift/action_hooks/start
	.openshift/action_hooks/stop
Changed actions hooks to execute permissions
Changed actions hooks to execute permissions
Changed actions hooks to execute permissions