Merge branch 'hotfix/0.2.5'
Update copy. Added enhancments to test page.
Merge branch 'hotfix/0.2.6' into develop