From e8451b03ba7c229aedadc4d8b33fba4bcb44311d Mon Sep 17 00:00:00 2001
From: vilius <vilius@192.168.100.113>
Date: Tue, 1 Apr 2014 11:42:09 +0300
Subject: [PATCH] Merge origin/master

Conflicts:
	.gitignore
---
 libs/exif.js      |  8 +++++++-
 styles/styles.css | 21 +++++++++++----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/libs/exif.js b/libs/exif.js
index 06bc8eb..5c92e72 100644
--- a/libs/exif.js
+++ b/libs/exif.js
@@ -322,7 +322,13 @@ var EXIF = (function() {
                 handleBinaryFile(new BinaryFile(e.target.result));
             };
 
-            fileReader.readAsBinaryString(img);
+            try{
+		fileReader.readAsBinaryString(img);
+	    }
+	    catch(err){
+		console.log("exif.js error: "+err.message);
+		}
+	    
         }
     }
 
diff --git a/styles/styles.css b/styles/styles.css
index 2b9bd7e..7c60ba8 100644
--- a/styles/styles.css
+++ b/styles/styles.css
@@ -330,6 +330,7 @@ label{
 
 .ddsmoothmenu{
 	position:fixed;
+	z-index:99999;
 	top:0;
 	left:0;
 	width:100%;
@@ -374,14 +375,6 @@ label{
 	background: #E4EBF8;
 	color: #2D2D2D;
 	}
-.ddsmoothmenu ul li ul{
-	position: absolute;
-	left: -3000px;
-	display: none;
-	visibility: hidden;
-	border:1px solid #5680C1;
-	border-top:0px;
-	}
 .ddsmoothmenu .hide_ul{
 	position: absolute;
 	left: -3000px;
@@ -390,8 +383,16 @@ label{
 	border:1px solid #5680C1;
 	border-top:0px;
 	}
+.ddsmoothmenu ul li ul{
+	position: absolute;
+	left: -3000px;
+	display: none;
+	visibility: hidden;
+	border:1px solid #5680C1;
+	border-top:0px;
+	}
 .ddsmoothmenu ul li ul li{
-	display: list-item;	
+	display: list-item;
 	background: #ffffff;
 	float: none;
 	}
@@ -403,7 +404,7 @@ label{
 	padding: 4px 5px 4px 5px;
 	margin: 0;
 	color: #2D2D2D;
-	}
+	}	
 * html .ddsmoothmenu{height: 1%;} /*Hack for IE7 and below*/
 .downarrowclass{
 	position: absolute;