Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/26/2015_bay_merge_2

Conflicts:
	.travis.yml
	polaris.dme

code/game/objects/items/stacks/sheets/glass.dm

@@ -28,7 +28,7 @@
 		if(istype(W,/obj/item/stack/cable_coil))
 			var/obj/item/stack/cable_coil/CC = W
 			if (get_amount() < 1 || CC.get_amount() < 5)
-				user << "<span class='warning>You need five lengths of coil and one sheet of glass to make wired glass.</span>"
+				user << "<span class='warning'>You need five lengths of coil and one sheet of glass to make wired glass.</span>"
 				return
 
 			CC.use(5)

code/game/objects/items/weapons/storage/storage.dm

@@ -335,7 +335,6 @@
 	..()
 
 	if(isrobot(user))
-		user << "<span class='warning'>You're a robot. No.</span>"
 		return //Robots can't interact with storage items.
 
 	if(!can_be_inserted(W))