Merged master to 1.0

example/live_w_locator.html

@@ -81,6 +81,11 @@
                         <option value="8">8</option>
                     </select>
                 </label>
+                <label>
+                    <span>Camera</span>
+                    <select name="input-stream_constraints" id="deviceSelection">
+                    </select>
+                </label>
             </fieldset>
         </div>
       <div id="result_strip">
@@ -93,11 +98,12 @@
     </section>
           <footer>
         <p>
-          &copy; Copyright by Christoph Oberhofer
+          &copy; Made with ❤️ by Christoph Oberhofer
         </p>
       </footer>
 
     <script src="vendor/jquery-1.9.0.min.js" type="text/javascript"></script>
+    <script src="//webrtc.github.io/adapter/adapter-latest.js" type="text/javascript"></script>
     <script src="../dist/quagga.js" type="text/javascript"></script>
     <script src="live_w_locator.js" type="text/javascript"></script>
   </body>