Some improvements
Merge branch 'shineisp/sandbox'
Fix language selection in EmailsTemplate
Merge pull request #55 from guestisp/master

Sync and Test the Guestisp code