- added email validation and fixed overwriting template paths during load()
Merge remote-tracking branch 'origin/master'