Merge branch 'release/1.7' into develop
Fixed mixed whitespace and indentation
[OE-4404] Added top border to event container. Small view restructure.
[OE-4404] Added top-border to episode summary containers
[OE-4404] Adjusted gii template and base styles for event top border
Merge branch 'release/1.7' into develop
Merge branch 'release/1.7' into develop
puppet php install fix
Puppet provisioning: split out git package into seperate file. Added nvm >> git dependency.

Vagrant build should be working correctly now. Issue with nvm installer has been resolved. See: https://github.com/creationix/nvm/issues/476
Merge branch 'release/1.7' into develop
Merge branch 'develop' of github.com:openeyes/OpenEyes into develop
Fixed gii grunt compass config
Fixed gii module sass import
ProtectedFile fixture.
+ [OE-4581] update release notes
[OEM-199] user session fix
[OEM-199] handle timed out session trying to change site and firm
small feature fix tp avoid Paternal/Maternal conflict pop-up
[OE-4588] Fix keys for measurement_reference table.
[OE-4588] Prevent measurement references from referencing both an episode and an event.