Update manifest.yml
use set_env_var function to set ZK env variables
update install dir of cart
update for 385 build
fix bad date format in changelog
Merge branch 'openshift-enterprise-rpm-6.1' of github.com:KurtStam/fuse-openshift-cartridge into openshift-enterprise-rpm-6.1
https://bugzilla.redhat.com/show_bug.cgi?id=1119146 fixing categories
Update manifest.yml
Merge pull request #15 from KurtStam/openshift-enterprise-rpm-6.1

Openshift enterprise rpm 6.1
https://bugzilla.redhat.com/show_bug.cgi?id=1118717 check if process is stopped
Merge pull request #16 from KurtStam/openshift-enterprise-rpm-6.1

https://bugzilla.redhat.com/show_bug.cgi?id=1118717 check if process is ...
Do not start fuse again if already running

Conflicts:
	bin/control
Fix bad merge
do not add conf to etc
fixed if syntax on stop
https://bugzilla.redhat.com/show_bug.cgi?id=1082955 updating details url
Merge pull request #21 from KurtStam/openshift-enterprise-rpm-6.1

https://bugzilla.redhat.com/show_bug.cgi?id=1082955 updating details url
merging PR from Matej
The environment variable OPENSHIFT_FUSE_ZOOKEEPER_PASSWORD and
OPENSHIFT_FUSE_ZOOKEEPER_URL are missing in fuse app

https://bugzilla.redhat.com/show_bug.cgi?id=1109058

Conflicts:
	bin/setup
Merge pull request #26 from bparees/refactor_setup_ose

refactor setup/install logic out of control script