Improve template samples; edit Elfinder template
repair message errors
Merge develop_tests