Merge branch '11.0' of https://github.com/muk-it/muk_web.git into 11.0

Conflicts:
	muk_web_client/static/description/index.html

muk_web_client/static/description/index.html

@@ -7,7 +7,11 @@
 	</div>
 </section>
 
+<<<<<<< HEAD
 <section class="oe_container" style="padding-bottom: 50px;">
+=======
+<section class="oe_container" style="padding-bottom: 60px;">
+>>>>>>> branch '11.0' of https://github.com/muk-it/muk_web.git
 	<div class="oe_row oe_spaced">
 		<div class="oe_picture">
 			<h3 class="oe_slogan">Overview</h3>
@@ -16,8 +20,14 @@
 				notifications. To add a channel listener to the client just
 				extend the web client and declare a new bus channel.
 			</p>
+<<<<<<< HEAD
 			<pre>
 		    	<code>
+=======
+			<p>
+			    <pre>
+			        <code>
+>>>>>>> branch '11.0' of https://github.com/muk-it/muk_web.git
 var WebClient = require('web.WebClient');
 var session = require('web.session');	
 
@@ -31,8 +41,14 @@ WebClient.include({
 		...
 	}
 });
+<<<<<<< HEAD
 		    	</code>
 			</pre>
+=======
+			        </code>
+			    </pre>
+			</p>
+>>>>>>> branch '11.0' of https://github.com/muk-it/muk_web.git
 		</div>
 	</div>
 </section>
@@ -49,4 +65,4 @@ WebClient.include({
 	</div>
 	<img src="logo.png" style="width: 200px; margin-bottom: 20px;"
 		class="center-block">
-</section>
+</section>