Fixing Story_87
Merge pull request #87 from michaelhidalgo/Story_87

Story 87
Making 3.4 - RC 1
Merge pull request #90 from TeamMentor/3.4_Release

Pushing 3.4 - RC1