Beautify
Merge branch 'devel' of github.com:mturilli/aimes.emanager into devel