Merged hotfix-0.7.11 into develop

CHANGELOG.md

@@ -1,5 +1,5 @@
 # Tracman Server Changelog
-###### v 0.7.10
+###### v 0.7.11
 
 
 #### v.0.7.10

README.md

@@ -1,5 +1,5 @@
 # <img align="left" src="/static/img/icon/by/48.png" alt="[]" title="The Tracman Logo">Tracman
-###### v 0.7.9
+###### v 0.7.11
 
 node.js application to display a sharable map with user's location.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tracman",
-  "version": "0.7.10",
+  "version": "0.7.11",
   "description": "Tracks user's GPS location",
   "main": "server.js",
   "dependencies": {

views/map.html

@@ -68,7 +68,7 @@
 	{% endif %}
 	
 	<!-- Streetview -->
-	{% if mapuser.settings.showStreetview and and disp!='0' %}
+	{% if mapuser.settings.showStreetview and disp!='0' %}
 		<div id='view'><img id='viewImg' alt="Streetview image"/></div>
 	{% endif %}