openshift
Merge branch 'master' of git@github.com:Austinh100/BBB.git

Conflicts:
	.openshift/action_hooks/build
	.openshift/action_hooks/deploy
	.openshift/action_hooks/post_deploy
	.openshift/action_hooks/post_start_php-5.3
	.openshift/action_hooks/post_stop_php-5.3
	.openshift/action_hooks/pre_build
	.openshift/action_hooks/pre_start_php-5.3
	.openshift/action_hooks/pre_stop_php-5.3
	.openshift/cron/weekly/chronograph