Update
General updates and Translation ready
New Version! Translation ready.
Merge my changes with 3.1.2