Composer install step in puppet now has a longer timeout because it does lots of work
Remove check that doesn't work on earlier php versions.
+ fix gii merge issue
Merge branch 'develop' of github.com:openeyes/OpenEyes into develop
Disable argument cloning for component stubs.
Set Europe/London as default timezone in Vagrant php5 setup
Quoting variables in bash is generally a good thing to do. Also, fixes issues when running scripts with a directory path that contains spaces
Quoting variables
Quoting variables
Removed backup file
Adding quotes in bash scripts in release 1.7
Changing $PROFILE to $profileVal parameter, using arg function, to avoid conflict with other ciBDD.sh arguments
Changing $PROFILE to $profileVal parameter, using arg function, to avoid conflict with other ciBDD.sh arguments
Add prop file for modules directory
Merge branch 'release/1.7' of github.com:openeyes/OpenEyes into release/1.7
Fix incorrect quoting on git command
Merge branch 'release/1.7' into develop

Conflicts:
	bin/oe-git
+ [OE-4031] ensure attachments not sent to recipients outsid of permissioned domains
+ [OE-4048] update Referral model for latest requirements
+ [OE-4048] add referral type fixture for testing