Add prebuild hook
Add prebuild hook
Merge branch 'master' of ssh://uw-chatrooms.rhcloud.com/~/git/uw

Conflicts:
	.openshift/action_hooks/pre_build
Changed hook from pre_build to deploy
Merge branch 'master' of ssh://uw-chatrooms.rhcloud.com/~/git/uw