Merging translations files to one per language
changing save requirements
Some fixes on views and layouts
Removed unused model Criterion
Bugfix, missing ) in 3 views