Added varible for openmrs version and 1.9.6 default version
gitignore changes
Merge remote-tracking branch 'upstream/multiserver'