Merge branch 'release/v1.3.6-constellation' into develop
Minor Fixes for TestMail Function
Downgrade to ruby 2.0
Bump Version
Merge branch 'release/v1.3.7-constellation'