Merge remote-tracking branch 'origin/master' into improvement/image-oembed

.meteor/packages

@@ -9,27 +9,42 @@ accounts-google
 accounts-meteor-developer
 accounts-password
 accounts-twitter
+blaze-html-templates
+check
 coffeescript
+ddp-rate-limiter
+ejson
 email
 fastclick
 http
 jquery
 less
+logging
+meteor-base
+mobile-experience
+mongo
+random
 reactive-dict
 reactive-var
+reload
 service-configuration
+session
+spacebars
+standard-minifiers
+tracker
 
 arunoda:streams
 rocketchat:lib
 
+rocketchat:authorization
 rocketchat:autolinker
 rocketchat:colors
 rocketchat:custom-oauth
 rocketchat:emojione
 rocketchat:favico
 rocketchat:file
+rocketchat:github-enterprise
 rocketchat:gitlab
-rocketchat:wordpress
 rocketchat:highlight
 rocketchat:ldap
 rocketchat:logger
@@ -41,14 +56,16 @@ rocketchat:oembed
 rocketchat:slashcommands-invite
 rocketchat:slashcommands-join
 rocketchat:slashcommands-leave
-#rocketchat:soundcloud
 rocketchat:spotify
 rocketchat:statistics
+rocketchat:theme
 rocketchat:webrtc
+rocketchat:wordpress
 #rocketchat:chatops
-#rocketchat:livechat
 #rocketchat:hubot
 #rocketchat:irc
+#rocketchat:livechat
+#rocketchat:soundcloud
 
 konecty:change-case
 konecty:delayed-task
@@ -76,6 +93,7 @@ mystor:device-detection
 nimble:restivus
 nooitaf:colors
 pauli:accounts-linkedin
+perak:codemirror
 percolate:migrations
 percolate:synced-cron
 raix:handlebar-helpers
@@ -89,23 +107,5 @@ todda00:friendly-slugs
 underscorestring:underscore.string
 yasaricli:slugify
 yasinuslu:blaze-meta
-rocketchat:theme
-rocketchat:authorization
-perak:codemirror
-standard-minifiers
-meteor-base
-mobile-experience
-mongo
-blaze-html-templates
-session
-tracker
-logging
-reload
-random
-ejson
-spacebars
-check
-rocketchat:github-enterprise
 # sanjo:jasmine
 # velocity:html-reporter
-ddp-rate-limiter

.meteor/versions

@@ -27,7 +27,6 @@ chrismbeckett:toastr@2.1.2_1
 coffeescript@1.0.10
 cosmos:browserify@0.8.1
 dandv:caret-position@2.1.1
-dburles:google-maps@1.1.5
 ddp@1.2.2
 ddp-client@1.2.1
 ddp-common@1.2.1
@@ -58,7 +57,7 @@ jparker:crypto-core@0.1.0
 jparker:crypto-md5@0.1.1
 jparker:gravatar@0.4.1
 jquery@1.11.4
-kadira:blaze-layout@2.1.0
+kadira:blaze-layout@2.2.0
 kadira:flow-router@2.7.0
 kevohagan:sweetalert@1.0.0
 konecty:autolinker@1.0.3
@@ -123,7 +122,6 @@ reload@1.1.4
 retry@1.0.4
 rocketchat:authorization@0.0.1
 rocketchat:autolinker@0.0.1
-rocketchat:chatops@0.0.1
 rocketchat:colors@0.0.1
 rocketchat:custom-oauth@1.0.0
 rocketchat:emojione@0.0.1

packages/rocketchat-markdown/markdown.coffee

@@ -11,7 +11,7 @@ class Markdown
 			msg = message.html
 
 			# Support ![alt text](http://image url)
-			msg = msg.replace(/\[([^\]]+)\]\((https?:\/\/[^\)]+)\)/gm, '<a href="$2" title="$1" class="swipebox" target="_blank"><div class="inline-image" style="background-image: url($2);"></div></a>')
+			msg = msg.replace(/!\[([^\]]+)\]\((https?:\/\/[^\)]+)\)/gm, '<a href="$2" title="$1" class="swipebox" target="_blank"><div class="inline-image" style="background-image: url($2);"></div></a>')
 
 			# Support [Text](http://link)
 			msg = msg.replace(/\[([^\]]+)\]\((https?:\/\/[^\)]+)\)/gm, '<a href="$2" target="_blank">$1</a>')