diff --git a/changelog.txt b/changelog.txt
index 81fb43e..f7430c7 100755
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,12 @@
+Monstra 2.2.1, 2013-04-06
+------------------------
+- Update Gelato to 1.0.3
+- Error Handler turned off for Production environment
+- Localization: Farsi(fa) translations fixes.
+- Pages Manager: fix translates #107
+- Missing Translation on Login Page - fixed #106
+- Lithuanian flag and other languages fixes. Thanks to mbarzda
+
 Monstra 2.2.0, 2013-03-25
 ------------------------
 - Mobile Ready! Monstra fully responsive for mobile devices, tablets, and normal computer screens.
@@ -27,7 +36,6 @@ Monstra 2.2.0, 2013-03-25
 - Pages Manager: page cloning problem - fixed.
 - Localizations: translations fixes.
 
-
 Monstra 2.1.3, 2012-12-09
 ------------------------
 - Pages Plugin: New shortcodes added - page_author, page_slug, page_url page_available, page_breadcrumbs, page_date, page_content.
diff --git a/engine/Monstra.php b/engine/Monstra.php
index a48a25e..6017e2b 100644
--- a/engine/Monstra.php
+++ b/engine/Monstra.php
@@ -39,7 +39,7 @@ class Monstra
     /**
      * The version of Monstra
      */
-    const VERSION = '2.2.0';
+    const VERSION = '2.2.1';
 
     /**
      * Monstra environment
diff --git a/engine/_init.php b/engine/_init.php
index a113eeb..e551bd1 100644
--- a/engine/_init.php
+++ b/engine/_init.php
@@ -1,14 +1,5 @@
 <?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
-/**
- * Report All Errors
- *
- * By setting error reporting to -1, we essentially force PHP to report
- * every error, and this is guranteed to show every error on future
- * releases of PHP. This allows everything to be fixed early!
- */
-error_reporting(-1);
-
 /**
  *  Monstra requires PHP 5.2.3 or greater
  */
@@ -32,6 +23,15 @@ include ROOT . DS .'engine'. DS .'Monstra.php';
  */
 Monstra::$environment = Monstra::PRODUCTION;
 
+/**
+ * Report Errors
+ */
+if (Monstra::$environment == Monstra::PRODUCTION) {
+    error_reporting(0); 
+} else {
+    error_reporting(-1);
+}
+
 /**
  * Initialize Monstra
  */
diff --git a/libraries/Gelato/Gelato.php b/libraries/Gelato/Gelato.php
index 60a2c01..c5a01a8 100644
--- a/libraries/Gelato/Gelato.php
+++ b/libraries/Gelato/Gelato.php
@@ -18,7 +18,7 @@
 /**
  * The version of Gelato
  */
-define('GELATO_VERSION', '1.0.2');
+define('GELATO_VERSION', '1.0.3');
 
 /** 
  * Define __DIR__ constant for PHP 5.2.x
diff --git a/libraries/Gelato/Html/Html.php b/libraries/Gelato/Html/Html.php
index 351f76b..bba92bc 100644
--- a/libraries/Gelato/Html/Html.php
+++ b/libraries/Gelato/Html/Html.php
@@ -28,6 +28,13 @@ class Html
         'accept', 'tabindex', 'accesskey', 'alt', 'title', 'class',
         'style', 'selected', 'checked', 'readonly', 'disabled',
     );
+	
+	/**
+	 * The registered custom macros.
+	 *
+	 * @var array
+	 */
+	public static $macros = array();
 
     /**
      * Protected constructor since this is a static class.
@@ -279,7 +286,56 @@ class Html
         $attributes['alt'] = (isset($attributes['alt'])) ? $attributes['alt'] : pathinfo($file, PATHINFO_FILENAME);
 
         return '<img'.Html::attributes($attributes).' />';
-    }
+    }    
+    
+	/**
+	 * Obfuscate an e-mail address to prevent spam-bots from sniffing it.
+     *
+     *  <code>
+     *  	echo Html::email('gelato@monstra.org');
+     * 	</code>
+     *
+	 * @param  string  $email
+	 * @return string
+	 */
+	 public static function email($email)
+	 {
+	     return str_replace('@', '&#64;', Html::obfuscate($email));
+	 }
+    
+    /**
+	 * Obfuscate a string to prevent spam-bots from sniffing it.
+	 *
+     * This method obfuscate the value, randomly convert each
+     * letter to its entity or hexadecimal representation, keeping a
+     * bot from sniffing the randomly obfuscated letters.
+     *
+     *  <code>
+     *  	echo Html::obfuscate('gelato@monstra.org');
+     * 	</code>
+     *
+	 * @param  string  $value
+	 * @return string
+	 */
+	public static function obfuscate($value)
+	{
+		$safe = '';
+
+		foreach (str_split($value) as $letter) {
+			switch (rand(1, 3)) {
+				case 1:
+					$safe .= '&#'.ord($letter).';';
+				break;
+				case 2:
+					$safe .= '&#x'.dechex(ord($letter)).';';
+				break;
+				case 3:
+					$safe .= $letter;
+			}
+		}
+
+		return $safe;
+	}
 
     /**
      * Convert html to plain text
diff --git a/libraries/Gelato/README.md b/libraries/Gelato/README.md
index 69f3f05..6d6fad1 100644
--- a/libraries/Gelato/README.md
+++ b/libraries/Gelato/README.md
@@ -4,6 +4,6 @@ Gelato is a PHP5 library for kickass Web Applications.
 
 ## Links
 - [Site](http://gelato.monstra.org)
-- [Github Repository](https://github.com/Monstra/gelato)
+- [Github Repository](https://github.com/MonstrLab/gelato)
 
 Copyright (C) 2013 Romanenko Sergey / Awilum [awilum@msn.com]
\ No newline at end of file
diff --git a/libraries/Gelato/changelog.txt b/libraries/Gelato/changelog.txt
index 9a78a9c..aa40a88 100644
--- a/libraries/Gelato/changelog.txt
+++ b/libraries/Gelato/changelog.txt
@@ -1,3 +1,13 @@
+Gelato 1.0.3, 2013-04-03
+------------------------
+- Html Class: obfuscate() method added.
+- Html Class: email() method added.
+- Html Class: missing $macros var added.
+
+Gelato 1.0.2, 2013-03-17
+------------------------
+- Added support for PHP 5.2.3
+
 Gelato 1.0.1, 2013-03-05
 ------------------------
 - New constant GELATO_CLASS_LOADER instead of GELATO_AUTOLOADER
diff --git a/plugins/box/backup/languages/fa.lang.php b/plugins/box/backup/languages/fa.lang.php
index e6ae865..ce765b6 100644
--- a/plugins/box/backup/languages/fa.lang.php
+++ b/plugins/box/backup/languages/fa.lang.php
@@ -8,10 +8,10 @@
     		'Delete' => 'حذف',
             'storage' => 'ذخیره سازی',
             'public' => 'عمومی',
-            'plugins' => 'افزونه ها',
+            'plugins' => 'پلاگین',
             'Size' => 'اندازه',
             'Actions' => 'عملیات',
-            'Delete backup: :backup' => 'حذف پشتیبان: نسخه پشتیبان',
-            'Creating...' => 'درحال ایجاد ...',
+            'Delete backup: :backup' => 'حذف نسخه پشتیبان: :backup',
+            'Creating...' => 'ایجاد...',
         )
 	);
\ No newline at end of file
diff --git a/plugins/box/blocks/languages/fa.lang.php b/plugins/box/blocks/languages/fa.lang.php
index ac86ced..d3aede3 100644
--- a/plugins/box/blocks/languages/fa.lang.php
+++ b/plugins/box/blocks/languages/fa.lang.php
@@ -3,27 +3,27 @@
     return array(
         'blocks' => array(
             'Blocks' => 'بلوک',
-            'Blocks manager' => 'مدیریت بلوک',  
+            'Blocks manager' => 'مدیریت بلوک',
             'Delete' => 'حذف',
             'Edit' => 'ویرایش',
             'Name' => 'نام',
             'Create New Block' => 'ایجاد بلوک جدید',
             'New Block' => 'بلوک جدید',
-            'Edit Block' => 'ویرایش بلوک',        
-            'Save' => 'ذخیره',        
-            'Save and Exit' => 'ذخیره و خروج',       
-            'Actions' => 'عملیات', 
-            'Required field' => 'کادر اجباری',
+            'Edit Block' => 'ویرایش بلوک',
+            'Save' => 'ذخیره',
+            'Save and Exit' => 'ذخیره و خروج',
+            'Actions' => 'عملیات',
+            'Required field' => 'کادر الزامی',
             'This block already exists' => 'این بلوک در حال حاضر وجود دارد',
             'This block does not exist' => 'این بلوک وجود ندارد',
-            'Delete block: :block' => 'حذف بلوک: :block',
-            'Block content' => 'محتوی بلوک',
+            'Delete block: :block' => 'Delete block: :block',
+            'Block content' => 'حذف بلوک: :block',
             'Block <i>:name</i> deleted' => 'بلوک <i>:name</i> حذف شد',
-            'Your changes to the block <i>:name</i> have been saved.' => 'تغییرات روی بلوک <i>:name</i> ذخیره شد.',
+            'Your changes to the block <i>:name</i> have been saved.' => 'تغییرات شما بر روی بلوک <i>:name</i> ذخیره شد.',
             'Delete block: :block' => 'حذف بلوک: :block',
             'View Embed Code' => 'نمایش کد درج شده',
             'Embed Code' => 'کد درج شده', 
             'Shortcode' => 'کدکوتاه',
             'PHP Code' => 'کد PHP',
         )
-    );
\ No newline at end of file
+    );
diff --git a/plugins/box/editor/languages/fa.lang.php b/plugins/box/editor/languages/fa.lang.php
index d60f2c0..169e952 100644
--- a/plugins/box/editor/languages/fa.lang.php
+++ b/plugins/box/editor/languages/fa.lang.php
@@ -3,6 +3,6 @@
     return array(
         'Editor' => array(
             'Editor' => 'ویرایشگر',
-            'Editor plugin' => 'افزونه ویرایشگر',  
+            'Editor plugin' => 'پلاگین ویرایشگر',  
         )
-    );
\ No newline at end of file
+    );
diff --git a/plugins/box/filesmanager/languages/fa.lang.php b/plugins/box/filesmanager/languages/fa.lang.php
index bc4ce69..c52c558 100644
--- a/plugins/box/filesmanager/languages/fa.lang.php
+++ b/plugins/box/filesmanager/languages/fa.lang.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 
     return array(
         'filesmanager' => array(
@@ -14,4 +14,4 @@
             'Extension' => 'پسوند',
             'Size' => 'اندازه',
         )
-    );
\ No newline at end of file
+    );
diff --git a/plugins/box/information/languages/fa.lang.php b/plugins/box/information/languages/fa.lang.php
index b180b4e..5e590e5 100644
--- a/plugins/box/information/languages/fa.lang.php
+++ b/plugins/box/information/languages/fa.lang.php
@@ -27,7 +27,7 @@
             'فایل index.php  مونسترا قابل نوشتن میباشند .  توصیه میکنیم همه مجوزهای نوشتن را حذف کنید. <br/>در سیستمهای یونیکس میتوانید با دستور : <code>chmod -R a-w :path</code> انجام دهید',
             'Due to the type and amount of information an error might give intruders when Core::$environment = Core::DEVELOPMENT, we strongly advise setting Core::PRODUCTION in production systems.' =>
             'با توجه به نوع و مقدار اطلاعات ممکن است هنگام Core::$environment = Core::DEVELOPMENT خطایی رخ بدهد ، ما شدیداً Core::PRODUCTION  را د رسیستم تولید توصیه میکنیم ',
-            'Monstra version' => 'نسخه Monstra',
+            'Monstra version' => 'نسخه مونسترا',
             'Directory Permissions' => 'مجوزهای شاخه',
             'Directory' => 'شاخه',
             'Writable' => 'قابل نوشتن',
@@ -37,4 +37,4 @@
             'Web Server' => 'وب سرور',
             'WebServer to PHP Interface' => 'وب سرور به رابط PHP',
         )
-    );
\ No newline at end of file
+    );
diff --git a/plugins/box/menu/languages/fa.lang.php b/plugins/box/menu/languages/fa.lang.php
index 4d50111..f4e1e27 100644
--- a/plugins/box/menu/languages/fa.lang.php
+++ b/plugins/box/menu/languages/fa.lang.php
@@ -24,4 +24,4 @@
             'Select category' => 'انتخاب مجموعه',
             'Required field' => 'کادر الزامی',
         )
-    );
\ No newline at end of file
+    );
diff --git a/plugins/box/pages/languages/fa.lang.php b/plugins/box/pages/languages/fa.lang.php
index 34b49a0..13974f7 100644
--- a/plugins/box/pages/languages/fa.lang.php
+++ b/plugins/box/pages/languages/fa.lang.php
@@ -7,7 +7,7 @@
             'Content' => 'محتوی',
             'Create New Page' => 'ایجاد صفحه جدید',
             'New Page' => 'صفحه جدید',
-            'Edit Page' => 'ویرایش صفحه',        
+            'Edit Page' => 'ویرایش صفحه',
             'Date' => 'تاریخ',
             'Clone' => 'کپی برداری',
             'Edit' => 'ویرایش',        
@@ -26,7 +26,7 @@
             'Month' => 'ماه',
             'Hour' => 'ساعت',
             'Minute' => 'دقیقه',
-            'Second' => 'ثتنیه',
+            'Second' => 'ثانیه',
             'This field should not be empty' => 'این کادر نباید خالی باشد',
             'This page already exists' => 'این صفحه در حال حاضر وجود دارد',
             'Extra' => 'اضافی',
@@ -51,4 +51,4 @@
             'Public' => 'عمومی',
             'Registered' => 'اعضاء',
         )
-    );
\ No newline at end of file
+    );
diff --git a/plugins/box/pages/languages/fr.lang.php b/plugins/box/pages/languages/fr.lang.php
index 656aca3..0ba4c46 100644
--- a/plugins/box/pages/languages/fr.lang.php
+++ b/plugins/box/pages/languages/fr.lang.php
@@ -40,7 +40,7 @@
             'Published' => 'Publiée',
             'Draft' => 'Brouillon',
             'Published on' => 'Publiée le',
-            'Edit 404 page' => 'Editer la page 404',
+            'Edit 404 Page' => 'Editer la page 404',
             'Page <i>:page</i> deleted' => 'Page <i>:page</i> supprimé',
             'Search Engines Robots' => 'Robots des moteurs de recherche',
             'Page' => 'Page',
diff --git a/plugins/box/pages/languages/lt.lang.php b/plugins/box/pages/languages/lt.lang.php
index 74b2910..828facd 100644
--- a/plugins/box/pages/languages/lt.lang.php
+++ b/plugins/box/pages/languages/lt.lang.php
@@ -5,7 +5,7 @@
             'Pages' => 'Puslapiai',
             'Pages manager' => 'Puslapių tvarkyklė',
             'Content' => 'Turinys',
-            'Create New page' => 'Sukurti Naują Puslapį',
+            'Create New Page' => 'Sukurti Naują Puslapį',
             'New Page' => 'Naujas Puslapis',
             'Edit Page' => 'Redaguoti Puslapį',
             'Date' => 'Data',
diff --git a/plugins/box/pages/languages/pt-br.lang.php b/plugins/box/pages/languages/pt-br.lang.php
index c8a9adf..e3560f4 100644
--- a/plugins/box/pages/languages/pt-br.lang.php
+++ b/plugins/box/pages/languages/pt-br.lang.php
@@ -40,7 +40,7 @@
             'Published' => 'Publicado',
             'Draft' => 'Rascunho',
             'Published on' => 'Publicada em',
-            'Edit 404 page' => 'Editar página de erro 404',
+            'Edit 404 Page' => 'Editar página de erro 404',
             'Page <i>:page</i> deleted' => 'Página <i>:page</i> deletada',
             'Search Engines Robots' => 'Crawlers de sistemas de buscas.',
             'Page' => 'Página',
diff --git a/plugins/box/pages/languages/ru.lang.php b/plugins/box/pages/languages/ru.lang.php
index db3fb5d..ba3384a 100644
--- a/plugins/box/pages/languages/ru.lang.php
+++ b/plugins/box/pages/languages/ru.lang.php
@@ -40,7 +40,7 @@
             'Published' => 'Опубликовано',
             'Draft' => 'Черновик',
             'Published on' => 'Опубликовано',
-            'Edit 404 page' => 'Редактировать страницу 404',
+            'Edit 404 Page' => 'Редактировать страницу 404',
             'Page <i>:page</i> deleted' => 'Страница <i>:page</i> удалена',
             'Search Engines Robots' => 'Поисковые роботы',
             'Page' => 'Страница',
diff --git a/plugins/box/pages/languages/sk.lang.php b/plugins/box/pages/languages/sk.lang.php
index 8bc7760..4ff9f0a 100644
--- a/plugins/box/pages/languages/sk.lang.php
+++ b/plugins/box/pages/languages/sk.lang.php
@@ -40,7 +40,7 @@
             'Published' => 'Zverejnené',
             'Draft' => 'Rozpísané',
             'Published on' => 'Zverejnené dňa',
-            'Edit 404 page' => 'Editovať stránku 404',
+            'Edit 404 Page' => 'Editovať stránku 404',
             'Page <i>:page</i> deleted' => 'Vymazať stránku: <i>:page</i>',
             'Search Engines Robots' => 'Vyhľadávacie roboty',
             'Page' => 'Stránka',
diff --git a/plugins/box/pages/languages/sr-yu.lang.php b/plugins/box/pages/languages/sr-yu.lang.php
index 065a49c..aaf697f 100644
--- a/plugins/box/pages/languages/sr-yu.lang.php
+++ b/plugins/box/pages/languages/sr-yu.lang.php
@@ -40,7 +40,7 @@
             'Published' => 'Objavljeno',
             'Draft' => 'Nacrt',
             'Published on' => 'Objavljeno od',
-            'Edit 404 page' => 'Izmeni 404 stranu',
+            'Edit 404 Page' => 'Izmeni 404 stranu',
             'Page <i>:page</i> deleted' => 'Strana <i>:page</i> je obrisana',
             'Search Engines Robots' => 'Roboti pretrage',
             'Page' => 'Strana',
diff --git a/plugins/box/plugins/languages/fa.lang.php b/plugins/box/plugins/languages/fa.lang.php
index d253d63..bfc873b 100644
--- a/plugins/box/plugins/languages/fa.lang.php
+++ b/plugins/box/plugins/languages/fa.lang.php
@@ -1,5 +1,5 @@
 <?php
-    
+
     return array(
         'plugins' => array(
             'Plugins' => 'افزونه ها',
@@ -17,4 +17,4 @@
             'Install' => 'نصب',
             'Uninstall' => 'حذف',
         )
-    );
\ No newline at end of file
+    );
diff --git a/plugins/box/sitemap/languages/fa.lang.php b/plugins/box/sitemap/languages/fa.lang.php
index 9c11161..6e7dae6 100644
--- a/plugins/box/sitemap/languages/fa.lang.php
+++ b/plugins/box/sitemap/languages/fa.lang.php
@@ -1,7 +1,7 @@
 <?php
-    
+
     return array(
         'sitemap' => array(
             'Sitemap' => 'نقشه سایت',
         )
-    );
\ No newline at end of file
+    );
diff --git a/plugins/box/snippets/languages/fa.lang.php b/plugins/box/snippets/languages/fa.lang.php
index 11763ef..d92aa91 100644
--- a/plugins/box/snippets/languages/fa.lang.php
+++ b/plugins/box/snippets/languages/fa.lang.php
@@ -12,7 +12,7 @@
             'New Snippet' => 'کدآماده جدید',
             'Edit Snippet' => 'ویرایش کدآماده',        
             'Save' => 'ذخیره',        
-            'Save and Exit' => 'ذخیره و خروج',        
+            'Save and Exit' => 'ذخیره و خروج', 
             'This snippet already exists' => 'این کدآماده از قبل موجود است',
             'This snippet does not exist' => 'این کدآماده وجود ندارد',
             'Delete snippet: :snippet' => 'حذف کدآماده: :snippet',
@@ -26,4 +26,4 @@
             'Shortcode' => 'کدکوتاه',
             'PHP Code' => 'کد PHP',
         )
-    );
\ No newline at end of file
+    );
diff --git a/plugins/box/system/languages/de.lang.php b/plugins/box/system/languages/de.lang.php
index 4e1f10e..0456776 100644
--- a/plugins/box/system/languages/de.lang.php
+++ b/plugins/box/system/languages/de.lang.php
@@ -21,6 +21,7 @@
             'Default Page' => 'Standardseite',
             'Time zone' => 'Zeitzone',
             'Language' => 'Sprache',
+            'Email' => 'Email',
             'Save' => 'Speichern',
             'Site' => 'Seite',
             'System version' => 'Systemversion',
diff --git a/plugins/box/system/languages/en.lang.php b/plugins/box/system/languages/en.lang.php
index 9d712bf..70b5f53 100644
--- a/plugins/box/system/languages/en.lang.php
+++ b/plugins/box/system/languages/en.lang.php
@@ -21,6 +21,7 @@
             'Default Page' => 'Default Page',
             'Time zone' => 'Time zone',
             'Language' => 'Language',
+            'Email' => 'Email',
             'Save' => 'Save',
             'Site' => 'Site',
             'System version' => 'System version',
diff --git a/plugins/box/system/languages/es.lang.php b/plugins/box/system/languages/es.lang.php
index 5c330dd..040c3e5 100644
--- a/plugins/box/system/languages/es.lang.php
+++ b/plugins/box/system/languages/es.lang.php
@@ -21,6 +21,7 @@
             'Default Page' => 'Página por defecto',
             'Time zone' => 'Zona horaria',
             'Language' => 'Lenguaje',
+            'Email' => 'Email',
             'Save' => 'Guardar',
             'Site' => 'Web',
             'System Version' => 'Version Web',
@@ -78,4 +79,4 @@
             'Official Support Forum' => 'Foro de Soporte Oficial',
             'Documentation' => 'Documentación',
         )
-    );
\ No newline at end of file
+    );
diff --git a/plugins/box/system/languages/fa.lang.php b/plugins/box/system/languages/fa.lang.php
index ad0170f..5b00cfc 100644
--- a/plugins/box/system/languages/fa.lang.php
+++ b/plugins/box/system/languages/fa.lang.php
@@ -1,5 +1,5 @@
 <?php
-    
+
     return array(
         'system' => array(
             'System' => 'سیستم',
@@ -7,7 +7,11 @@
             'Sitemap created' => 'نقشه سایت ایجاد شد',
             'Create Sitemap' => 'ایجاد نقشه سایت',
             'on' => 'روشن',
-            'off'=> 'خاموش',    
+<<<<<<< HEAD
+            'off'=> 'خاموش', 
+=======
+            'off'=> 'خاموش',
+>>>>>>> refs/remotes/origin/master
             'Site Url' => 'آدرس سایت',
             'Maintenance Mode' => 'حالت تعمیر و نگهداری',
             'Maintenance Mode On' => 'حالت تعمیر و نگهداری روشن',
@@ -21,19 +25,21 @@
             'Default Page' => 'صفحه پیشفرض',
             'Time zone' => 'منطقه زمانی',
             'Language' => 'زبان',
+            'Email' => 'Email',
             'Save' => 'ذخیره',
-            'Site' => 'سایت',        
+<<<<<<< HEAD
+            'Site' => 'سایت', 
+=======
+            'Site' => 'سایت',
+>>>>>>> refs/remotes/origin/master
             'System version' => 'نسخه سیستم',
             'System version ID' => 'شناسه نسخه سیستم',
             'GZIP' => 'GZIP',
             'Debugging' => 'اشکال زدائی',
             'Plugin API' => 'API پلاگین',
-            'Plugins active' => 'پلاگینهای فعال', 
+            'Plugins active' => 'پلاگینهای فعال',
             'Actions registered' => 'عملیات ثبت شده',
             'Filters registered' => 'فیلترهای ثبت شده',
-            'logout' => 'خروج',
-            'site' => 'سایت',
-            'Core' => 'هسته',
             'Delete Temporary Files' => 'حذف فایلهای موقت',
             'Download the latest version' => 'دانلود جدیدترین نسخه',
             'Powered by' => 'قدرت گرفته از',
@@ -57,10 +63,10 @@
             'Directory: <b> :dir </b> writable' => 'شاخه: <b> :dir </b> قابل نوشتن میباشد',
             'Directory: <b> :dir </b> not writable' => 'شاخه: <b> :dir </b> غیرقابل نوشتن میباشد',
             'PHP Version' => 'نسخه PHP',
-            'Module DOM is installed' => 'ماژول DOM نصب شده',
+            'Module DOM is installed' => 'ماژول DOM نصب شده است',
             'Module DOM is required' => 'ماژول DOM مورد نیاز است',
-            'Module Mod Rewrite is installed' => 'ماژول Mod Rewrite نصب شده',
-            'Module SimpleXML is installed' => 'ماژول SimpleXML نصب شده',
+            'Module Mod Rewrite is installed' => 'ماژول Mod Rewrite نصب شده است',
+            'Module SimpleXML is installed' => 'ماژول SimpleXML نصب شده است',
             'PHP 5.2 or greater is required' => 'PHP 5.2 یا بالاتر مورد نیاز است',
             'Apache Mod Rewrite is required' => 'Mod Rewrite آپاچی مورد نیاز است',
             'SimpleXML module is required' => 'ماژول SimpleXML مورد نیاز است',
@@ -72,11 +78,11 @@
             'Email not valid' => 'ایمیل معتبر نیست',
             'Install' => 'نصب',
             '...Monstra says...' => '...مونسترا میگوید...',
-            'Sitemap file writable' => 'فایل نقشه سایت قابل نوشتن است',
+            'Sitemap file writable' => 'فایل نقشه سایت قابل نوشتن میباشد',
             'Sitemap file not writable' => 'فایل نقشه سایت غیرقابل نوشتن میباشد',
             'Main .htaccess file writable' => 'فایل اصلی .htaccess قابل نوشتن میباشد',
             'Main .htaccess file not writable' => 'فایل اصلی .htaccess غیرقابل نوشتن میباشد',
-            'Official Support Forum' => 'انجمن رسمی پشتیبانی',
+            'Official Support Forum' => 'انجمن پشتیبانی',
             'Documentation' => 'مستندات',
         )
-    );
\ No newline at end of file
+    );
diff --git a/plugins/box/system/languages/fr.lang.php b/plugins/box/system/languages/fr.lang.php
index 202032c..d0546dc 100644
--- a/plugins/box/system/languages/fr.lang.php
+++ b/plugins/box/system/languages/fr.lang.php
@@ -1,5 +1,5 @@
 <?php
-    
+
     return array(
         'system' => array(
             'System' => 'Système',
@@ -7,7 +7,7 @@
             'Sitemap created' => 'Plan du site créé',
             'Create sitemap' => 'Créer un plan du site',
             'on' => 'on',
-            'off'=> 'off',    
+            'off'=> 'off',
             'Site url' => 'Url du site',
             'Maintenance Mode' => 'Mode de maintenance',
             'Maintenance Mode On' => 'Mode de maintenance On',
@@ -21,14 +21,15 @@
             'Default page' => 'Page par défaut',
             'Time zone' => 'Fuseau horaire',
             'Language' => 'Langue',
+            'Email' => 'Email',
             'Save' => 'Enregistrer',
-            'Site' => 'Site',        
+            'Site' => 'Site',
             'System version' => 'Version du système',
             'System version ID' => 'ID de la version du système',
             'GZIP' => 'GZIP',
             'Debugging' => 'Débogage',
             'Plugin API' => 'Plugin API',
-            'Plugins active' => 'Plugins actifs', 
+            'Plugins active' => 'Plugins actifs',
             'Actions registered' => 'Actions enregistrées',
             'Filters registered' => 'Filtres enregistrées',
             'logout' => 'déconnexion',
@@ -79,4 +80,4 @@
             'Official Support Forum' => 'Forum Support Officiel',
             'Documentation' => 'Documentation',
         )
-    );
\ No newline at end of file
+    );
diff --git a/plugins/box/system/languages/hu.lang.php b/plugins/box/system/languages/hu.lang.php
index 99a0d23..6296828 100644
--- a/plugins/box/system/languages/hu.lang.php
+++ b/plugins/box/system/languages/hu.lang.php
@@ -1,5 +1,5 @@
 <?php
-    
+
     return array(
         'system' => array(
             'System' => 'Rendszer',
@@ -7,7 +7,7 @@
             'Sitemap created' => 'Oldaltérkép elkészült',
             'Create Sitemap' => 'Oldaltérkép készítése',
             'on' => 'be',
-            'off'=> 'ki',    
+            'off'=> 'ki',
             'Site Url' => 'Weboldal címe (url)',
             'Maintenance Mode' => 'Karbantartási mód',
             'Maintenance Mode On' => 'Karbantartási mód Be',
@@ -21,14 +21,15 @@
             'Default Page' => 'Alapértelmezett kezdőoldal',
             'Time zone' => 'Időzóna',
             'Language' => 'Nyelv',
+            'Email' => 'Email',
             'Save' => 'Mentés',
-            'Site' => 'Weboldal',        
+            'Site' => 'Weboldal',
             'System version' => 'Rendszer verzió',
             'System version ID' => 'Rendszer verziószám',
             'GZIP' => 'GZIP',
             'Debugging' => 'Hibakeresés',
             'Plugin API' => 'Plugin API',
-            'Plugins active' => 'A Pluginok aktívak', 
+            'Plugins active' => 'A Pluginok aktívak',
             'Actions registered' => 'Actions registered',
             'Filters registered' => 'Filters registered',
             'logout' => 'Kilépés',
@@ -79,4 +80,4 @@
             'Official Support Forum' => 'Hivatalos Fórum',
             'Documentation' => 'Dokumentáció',
         )
-    );
\ No newline at end of file
+    );
diff --git a/plugins/box/system/languages/it.lang.php b/plugins/box/system/languages/it.lang.php
index 0515976..93a1a85 100644
--- a/plugins/box/system/languages/it.lang.php
+++ b/plugins/box/system/languages/it.lang.php
@@ -21,6 +21,7 @@
             'Default Page' => 'Pagina Predefinita',
             'Time zone' => 'Fuso orario',
             'Language' => 'Lingua',
+            'Email' => 'Email',
             'Save' => 'Salva',
             'System version' => 'Versione del sistema',
             'System version ID' => 'ID del sistema',
diff --git a/plugins/box/system/languages/lt.lang.php b/plugins/box/system/languages/lt.lang.php
index 84c61aa..dda63cd 100644
--- a/plugins/box/system/languages/lt.lang.php
+++ b/plugins/box/system/languages/lt.lang.php
@@ -3,12 +3,12 @@
     return array(
         'system' => array(
             'System' => 'Sistema',
-            'Published a new version of the Monstra' => 'Išleista nauja Monstra versija',
+            'Published a new version of the :monstra' => 'Išleista nauja :monstra versija',
             'Sitemap created' => 'Sitemap sukurtas',
             'Create Sitemap' => 'Sukurti sitemap',
             'on' => 'įjungti',
             'off'=> 'išjungti',
-            'Site url' => 'Tinklapio adresas (url)',
+            'Site Url' => 'Tinklapio adresas (url)',
             'Maintenance Mode' => 'Remonto režimas',
             'Maintenance Mode On' => 'Įjungti remonto režimą',
             'Maintenance Mode Off' => 'Išjungti remonto režimą',
@@ -21,7 +21,9 @@
             'Default Page' => 'Pagrindinis puslapis',
             'Time zone' => 'Laiko zona',
             'Language' => 'Kalba',
+            'Email' => 'El. paštas',
             'Save' => 'Išsaugoti',
+            'Site' => 'Tinklapis',
             'System version' => 'Sistemos versija',
             'System version ID' => 'Sistemos versijos ID',
             'GZIP' => 'GZIP',
@@ -37,7 +39,7 @@
             'Settings' => 'Nustatymai',
             'Temporary files deleted' => 'Laikinos bylos ištrintos',
             'Extends' => 'Išplėtimas',
-            'View site' => 'Peržiūrėti tinklapį',
+            'View Site' => 'Peržiūrėti tinklapį',
             'Welcome, :username' => 'Sveiki, :username',
             'Reset Password' => 'Gauti naują slaptažodį',
             '< Back to Website' => '< Grįžti į tinklapį',
@@ -46,6 +48,7 @@
             'Send New Password' => 'Siųsti naują slaptažodį',
             'This user does not exist' => 'Tokio naudotojo nėra',
             'Version' => 'Versija',
+            'Plugin does not exist' => 'Papildinio nėra',
 
             'Install script writable' => 'Galima rašyti į diegimo scenarijų',
             'Install script not writable' => 'Negalima rašyti į diegimo scenarijų',
@@ -61,7 +64,7 @@
             'SimpleXML module is required' => 'Reikalingas SimpleXML modulis',
             'Field "Site name" is empty' => 'Laukas „Tinklapio pavadimas“ yra tuščias',
             'Field "Email" is empty' => 'Laukas „El. paštas“ yra tuščias',
-            'Field "Login" is empty' => 'Laukas „Prisijungimas“ yra tuščias',
+            'Field "Username" is empty' => 'Laukas „Prisijungimo vardas“ yra tuščias',
             'Field "Password" is empty' => 'Laukas „Slaptažodis“ yra tuščias',
             'Field "Site url" is empty' => 'Laukas „Tinklapio adresas (url)“ yra tuščias',
             'Email not valid' => 'Neteisingas el. pašto adresas',
diff --git a/plugins/box/system/languages/pt-br.lang.php b/plugins/box/system/languages/pt-br.lang.php
index 955e8df..a248a3e 100644
--- a/plugins/box/system/languages/pt-br.lang.php
+++ b/plugins/box/system/languages/pt-br.lang.php
@@ -21,6 +21,7 @@
             'Default Page' => 'Página padrão',
             'Time zone' => 'Timezone padrão',
             'Language' => 'Linguagem',
+            'Email' => 'Email',
             'Save' => 'Salvar',
             'System version' => 'Versão do sistema',
             'System version ID' => 'ID (longo) da versão do sistema',
diff --git a/plugins/box/system/languages/ru.lang.php b/plugins/box/system/languages/ru.lang.php
index 84e8d7a..d12e1f7 100644
--- a/plugins/box/system/languages/ru.lang.php
+++ b/plugins/box/system/languages/ru.lang.php
@@ -21,6 +21,7 @@
             'Default Page' => 'Страница по умолчанию',
             'Time zone' => 'Временная зона',
             'Language' => 'Язык',
+            'Email' => 'Email',
             'Save' => 'Сохранить',
             'System version' => 'Версия системы',
             'System version ID' => 'Версия системы ID',
diff --git a/plugins/box/system/languages/sk.lang.php b/plugins/box/system/languages/sk.lang.php
index dcb866c..194985c 100644
--- a/plugins/box/system/languages/sk.lang.php
+++ b/plugins/box/system/languages/sk.lang.php
@@ -21,6 +21,7 @@
             'Default Page' => 'Základná stránka - Default page',
             'Time zone' => 'Časové pásmo',
             'Language' => 'Jazyk',
+            'Email' => 'Email',
             'Save' => 'Uložiť',
             'System version' => 'Verzia systému',
             'System version ID' => 'ID verzie systému',
diff --git a/plugins/box/system/languages/sr-yu.lang.php b/plugins/box/system/languages/sr-yu.lang.php
index b36d62a..8afaedd 100644
--- a/plugins/box/system/languages/sr-yu.lang.php
+++ b/plugins/box/system/languages/sr-yu.lang.php
@@ -1,5 +1,5 @@
 <?php
-    
+
     return array(
         'system' => array(
             'System' => 'Sistem',
@@ -7,7 +7,7 @@
             'Sitemap created' => 'Mapa sajta je Kreirana!!!',
             'Create sitemap' => 'Kreiraj Mapu sajta',
             'on' => 'uključeno',
-            'off'=> 'isključeno',    
+            'off'=> 'isključeno',
             'Site url' => 'URL sajta',
             'Maintenance Mode' => 'Mod Održavanja',
             'Maintenance Mode On' => 'Uključi Mod Održavanja',
@@ -21,14 +21,15 @@
             'Default page' => 'Početna stranica',
             'Time zone' => 'Vremenska zona',
             'Language' => 'Jezik',
+            'Email' => 'Email',
             'Save' => 'Sačuvaj',
-            'Site' => 'Sajt',        
+            'Site' => 'Sajt',
             'System version' => 'Sistemska verzija',
             'System version ID' => 'ID sistemske verzije',
             'GZIP' => 'GZIP',
             'Debugging' => 'Odklanjanje grešaka',
             'Plugin API' => 'Dodatak API',
-            'Plugins active' => 'Aktivni Dodaci', 
+            'Plugins active' => 'Aktivni Dodaci',
             'Actions registered' => 'Actions registered',
             'Filters registered' => 'Filters registered',
             'logout' => 'Izloguj se',
@@ -79,4 +80,4 @@
             'Official Support Forum' => 'Zvaničan forum podrške',
             'Documentation' => 'Dokumentacija',
         )
-    );
\ No newline at end of file
+    );
diff --git a/plugins/box/system/languages/uk.lang.php b/plugins/box/system/languages/uk.lang.php
index d780d18..2f044ae 100644
--- a/plugins/box/system/languages/uk.lang.php
+++ b/plugins/box/system/languages/uk.lang.php
@@ -21,6 +21,7 @@
             'Default Page' => 'Сторінка по умовчанню',
             'Time zone' => 'Тимчасова зона',
             'Language' => 'Мова',
+            'Email' => 'Email',
             'Save' => 'Зберегти',
             'System version' => 'Версія системи',
             'System version ID' => 'Версія системи ID',
diff --git a/plugins/box/themes/languages/fa.lang.php b/plugins/box/themes/languages/fa.lang.php
index cc838eb..57f0a57 100644
--- a/plugins/box/themes/languages/fa.lang.php
+++ b/plugins/box/themes/languages/fa.lang.php
@@ -17,7 +17,8 @@
             'Clone' => 'کپی برداری',
             'Edit' => 'ویرایش',
             'Delete' => 'حذف',
-            'Actions' => 'عملیات',        
+            'Actions' => 'عملیات',
+            'Admin Theme' => 'قالب مدیریت',
             'Create New Chunk' => 'ایجاد قسمت جدید',
             'New Chunk' => 'قسمت جدید',
             'Chunks' => 'قسمتها',
@@ -30,8 +31,8 @@
             'Edit Template' => 'ویرایش قالب',
             'Edit Chunk' => 'ویرایش قسمت',
             'Edit Styles' => 'ویرایش استایل',
-            'Current site theme' => 'پوسته جاری سایت',
-            'Current admin theme' => 'پوسته جاری مدیریت',
+            'Current site theme' => 'پوسته فعلی سایت',
+            'Current admin theme' => 'پوسته فعلی مدیریت',
             'This template already exists' => 'این قالب هم اکنون موجود است',
             'This chunk already exists' => 'این قسمت هم اکنون موجود است',
             'This styles already exist' => 'این استایل هم اکنون موجود است',
@@ -40,10 +41,10 @@
             'Your changes to the styles <i>:name</i> have been saved.' => 'تغییرات شما بر روی استایل <i>:name</i> ذخیره شد.',
             'Your changes to the template <i>:name</i> have been saved.' => 'تغییرات شما بر روی قالب <i>:name</i> ذخیره شد.',
             'Required field' => 'کادرهای الزامی',
-            'Scripts' => 'اسکریپت',
+            'Scripts' => 'اسکریپت ها',
             'Create New Script' => 'ایجاد اسکریپت جدید',
             'Script content' => 'اسکریپت محتوا',
             'New Script' => 'اسکریپت جدید',
             'Edit Script' => 'ویرایش اسکریپت',
         )
-    );
\ No newline at end of file
+    );
diff --git a/plugins/box/users/languages/fa.lang.php b/plugins/box/users/languages/fa.lang.php
index e281a4f..ead1eb2 100644
--- a/plugins/box/users/languages/fa.lang.php
+++ b/plugins/box/users/languages/fa.lang.php
@@ -13,7 +13,7 @@
             'Edit' => 'ویرایش',
             'Actions' => 'عملیات',
             'Delete' => 'حذف',
-            'Enter' => 'وارد شدن',
+            'Enter' => 'ورود',
             'Logout' => 'خروج',
             'Register New User' => 'ثبت نام کاربر جدید',
             'New User Registration' => 'ثبت نام کاربر جدید',
@@ -34,7 +34,7 @@
             'Old password' => 'پسورد قدیم',
             'New password' => 'پسورد جدید',
             'Welcome' => 'خوش آمدید',
-            'Wrong <b>username</b> or <b>password</b>' => '<b>username</b> و یا <b>password</b> اشتباه است',
+            'Wrong <b>username</b> or <b>password</b>' => '<b>نام کاربری</b> و یا <b>پسورد</b> اشتباه است',
             'Your changes have been saved.' => 'تغییرات شما ذخیره شدند.',
             'New user have been registered.' => 'کاربر جدید ثبت نام شد.',
             'Captcha' => 'کدامنیتی',
@@ -55,7 +55,7 @@
             'Monstra says: This is not your profile...' => 'مونسترا میگوید: این پروفایل شما نیست ...',
             'User registration is closed.' => 'ثبت نام کاربر بسته شده است.',
             'Allow user registration' => 'اجازه ثبت نام کاربر',
-            'Required field' => 'کادر اجباری',
+            'Required field' => 'کادر الزامی',
             'This user doesnt exist' => 'این کاربر وجود ندارد',
             'Captcha code is wrong' => 'کدامنیتی اشتباه است',
             'Your login details for :site_name has been sent' => 'جزئیات ورود شما برای :site_name ارسال شد',
@@ -64,4 +64,4 @@
             'About Me' => 'درباره من',
             'Profile' => 'پروفایل',
         )
-    );
\ No newline at end of file
+    );
diff --git a/plugins/box/users/languages/lt.lang.php b/plugins/box/users/languages/lt.lang.php
index b828ee7..6dde2a1 100644
--- a/plugins/box/users/languages/lt.lang.php
+++ b/plugins/box/users/languages/lt.lang.php
@@ -13,7 +13,7 @@
             'Edit' => 'Redaguoti',
             'Actions' => 'Veiksmai',
             'Delete' => 'Ištrinti',
-            'Log In' => 'Log In',
+            'Log In' => 'Prisijungti',
             'Log Out' => 'Atsijungti',
             'Register New User' => 'Užregistruoti Naują Naudotoją',
             'New User Registration' => 'Naujo naudotojo registracija',
diff --git a/plugins/box/users/views/frontend/login.view.php b/plugins/box/users/views/frontend/login.view.php
index 7c412e1..5403a62 100644
--- a/plugins/box/users/views/frontend/login.view.php
+++ b/plugins/box/users/views/frontend/login.view.php
@@ -5,5 +5,9 @@
     <?php echo Form::hidden('csrf', Security::token()); ?>
     <label><?php echo __('Username', 'users'); ?></label><input name="username" type="text" class="input-large" />
     <label><?php echo __('Password', 'users'); ?></label><input name="password" type="password" class="input-large" />
-    <br /><input name="login_submit" class="btn" type="submit" value="<?php echo __('Enter', 'users'); ?>" /> <a class="small-grey-text reset-password-btn" href="<?php echo Option::get('siteurl').'users/password-reset'; ?>"><?php echo __('Forgot your password?', 'users');?></a></td></tr>
+<<<<<<< HEAD
+    <br /><input name="login_submit" class="btn" type="submit" value="<?php echo __('Log In', 'users'); ?>" /> <a class="small-grey-text reset-password-btn" href="<?php echo Option::get('siteurl').'users/password-reset'; ?>"><?php echo __('Forgot your password?', 'users');?></a></td></tr>
+=======
+    <br /><input name="login_submit" class="btn" type="submit" value="<?php echo __('Login', 'users'); ?>" /> <a class="small-grey-text reset-password-btn" href="<?php echo Option::get('siteurl').'users/password-reset'; ?>"><?php echo __('Forgot your password?', 'users');?></a></td></tr>
+>>>>>>> refs/remotes/origin/master
 </form>
diff --git a/plugins/captcha/captcha/languages/fa.lang.php b/plugins/captcha/languages/fa.lang.php
similarity index 96%
rename from plugins/captcha/captcha/languages/fa.lang.php
rename to plugins/captcha/languages/fa.lang.php
index 8701a6c..746cf87 100644
--- a/plugins/captcha/captcha/languages/fa.lang.php
+++ b/plugins/captcha/languages/fa.lang.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 
     return array(
         'captcha' => array(
diff --git a/plugins/sandbox/languages/fa.lang.php b/plugins/sandbox/languages/fa.lang.php
new file mode 100644
index 0000000..f2dd21c
--- /dev/null
+++ b/plugins/sandbox/languages/fa.lang.php
@@ -0,0 +1,10 @@
+<?php
+
+    return array(
+        'sandbox' => array(
+            'Sandbox' => 'سندباکس',
+            'Sandbox plugin for Monstra' => 'پلاگین سندباکس برای مونسترا',
+            'Sandbox template' => 'قالب سندباکس',
+            'Save' => 'ذخیره',
+        )
+    );
diff --git a/public/assets/img/flags/lt.png b/public/assets/img/flags/lt.png
index c31180d..f12a14b 100644
Binary files a/public/assets/img/flags/lt.png and b/public/assets/img/flags/lt.png differ