bug 7 impl, just consistency on Return or Back text
Merge branch 'master' of github.com:michglass/GlassHouse