114 files changed, 12087 insertions, 0 deletions

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
new file mode 100644
index 0000000..16206fd
--- /dev/null
+++ b/doc/CHANGELOG
@@ -0,0 +1,84 @@
+==0.6 (27/03/13)==
+   Added CoAP ([http://tools.ietf.org/html/draft-ietf-core-coap-14 draft-14]) implementation (Server and Client)
+   Added Python WebIOPi Client class (HTTP or CoAP with HTTP fallback)
+   Added Python WebIOPi MulticastClient class (CoAP)
+   Added Serial, I2C, SPI and 1-Wire  support
+     Python lightweight drivers with no dependency
+     Automatically load required linux modules
+     Added many device drivers, see [DEVICES device support page]
+   Added [Configuration] file
+   Added Serial monitor web app
+   Added Devices monitor web app
+   Added Devices abstractions Javascript class
+   Added GPIO digitalRead/Write and getFunction methods
+   Added Cache-Control REST response header
+   Added Server logging facility
+   Added jQuery-mobile
+   Improved button up/down handling on mobile devices
+   Fixed error fetching python-dev package during setup
+   Fixed webiopi-passwd missing execution flag when installing with PiStore
+   Fixed binary file serving
+   Fixed iOS6 Safari Mobile bug
+
+
+==0.5.3 (01/07/13)==
+   Added board revision REST URI (submitted by Andreas Riegg)
+   Added encrypted passwd file to store credentials used for HTTP authentication
+   Added webiopi-passwd command-line program to generate passwd file
+   Moved demo to examples/custom folder, added examples/basic
+   Changed /dev/mem access to allow webiopi import without root privileges when not using GPIOs
+   Disabled update checker to avoid "Update available" link
+   Improved GPIO error handling
+   Fixed encoding issue with python 2.x giving a blank page
+   Fixed setup script
+
+==0.5.2 (12/21/12 - PiStore only)==
+   Fixed blank page and file handling when server start at boot
+   Improved macros handling to allow zeo, one or more args
+   Added server loop helper
+   Improved setup.sh for the PiStore
+   Added play.sh for the PiStore to open the browser
+
+==0.5.1 (11/16/12)==
+===New Features===
+   REV 2 boards support
+   Added setup script to ease WebIOPi install
+   Use WebIOPi in your own Python scripts
+   Login/Password protection
+   Software PWM
+   Binary sequence output
+
+===Python Server & REST API===
+   Usable as a library
+   Added Python 3 support
+   Removed RPi.GPIO library dependency
+   Improved security
+   Improved file serving
+   Improved REST API
+   Added ability to use custom REST macro
+   Added ability to output a single pulse
+   Added ability to output a binary sequence
+   Added software PWM
+
+===Javascript Library===
+   Improved and simplified
+   Added ability to create custom buttons with one or two callbacks (mousedown and mouseup)
+   Added helpers for new REST functions (macro, pulse, sequence, PWM, ...)
+
+===Other changes===  
+   PHP Server discontinued
+
+
+==0.3 (08/27/12)==
+   Fixed security issue in the Python server
+   Python server general improvements
+   Python server display real IP
+   Allow PHP5 < 5.4 (Works on Debian wheezy)
+   Added update tracking
+   Refactored Javascript code to be used as a library
+   Changed IDs and CSS naming
+   Added expert app
+
+
+==0.2 (08/21/12)==
+   Initial release
\ No newline at end of file
diff --git a/doc/INSTALL b/doc/INSTALL
new file mode 100644
index 0000000..e34f9db
--- /dev/null
+++ b/doc/INSTALL
@@ -0,0 +1,46 @@
+WebIOPi is developed and tested on Raspbian.
+
+You only need Python, either 2.7 or 3.2. Download, then extract and install WebIOPi. The setup script will automatically download and install required dependencies using apt-get. You may have to manually install GCC and Python development headers if you are not using Raspbian.
+
+$ wget http://webiopi.googlecode.com/files/WebIOPi-0.6.0.tar.gz
+$ tar xvzf WebIOPi-0.6.0.tar.gz
+$ cd WebIOPi-0.6.0
+$ sudo ./setup.sh
+
+Finally, run Python using webiopi command :
+$ sudo webiopi [-h] [-c config] [-l log] [-s script] [-d] [port]
+
+    Options:
+      -h, --help           Display this help
+      -c, --config file    Load config from file
+      -l, --log file       Log to file
+      -s, --script file    Load script from file
+      -d, --debug          Enable DEBUG
+
+    Arguments:
+      port                 Port to bind the HTTP Server
+ 
+You're done, and ready to enjoy WebIOPi ! But the server and GPIO state will be lost when you'll stop the script (CTRL-C) or close the terminal.
+
+You can also start/stop the background service :
+$ sudo /etc/init.d/webiopi start
+and
+$ sudo /etc/init.d/webiopi stop
+
+You can even setup your system to start webiopi at startup :
+$ sudo update-rc.d webiopi defaults
+
+
+=Usage=
+If your are directly using your Raspberry Pi with keyboard/mouse/display plugged,  open a browser to http://localhost:8000/
+
+If your Raspberry Pi is connected to your network, you can open a browser to http://raspberrypi:8000/ with any device of your network. Replace raspberrypi by its IP.
+
+You can even add a port redirection on your router (and/or use IPv6) to control your GPIOs over Internet !
+
+Default user is "webiopi" and password is "raspberry"
+
+By choosing the GPIO Header link on the main page, you will be able to control GPIO using a web UI which looks like the board header.
+   Click/Tap the OUT/IN button to change GPIO direction.
+   Click/Tap pins to change the GPIO output state.
+http://trouch.com/wp-content/uploads/2012/08/webiopi-chrome.png
\ No newline at end of file
diff --git a/doc/LICENSE b/doc/LICENSE
new file mode 100644
index 0000000..4112d3e
--- /dev/null
+++ b/doc/LICENSE
@@ -0,0 +1,204 @@
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   
diff --git a/doc/README b/doc/README
new file mode 100644
index 0000000..f17ecc9
--- /dev/null
+++ b/doc/README
@@ -0,0 +1,60 @@
+===WebIOPi is a fully integrated Internet of Things framework for the Raspberry Pi.===
+   Control, debug, and use your Pi's GPIO locally or remotely, from a browser or any app.
+   WebIOPi is the perfect Swiss-knife to make connected things with the Raspberry Pi.
+   Developed and provided by Eric PTAK, french R&D engineer in networks, software, and Internet of Things.
+
+===Features===
+   REST API over HTTP and CoAP (draft-14) with multicast support
+   Server written in Python with zero dependency
+   Supports GPIO, Serial, I2C, SPI, 1-Wire with zero dependency
+   Supports more than [DEVICES 30 devices] including DAC, ADC, sensors...
+   Full Python library for the Server, GPIO, Serial, I2C, SPI and devices drivers
+   Compatible with both Python 2 and 3
+   Extensible and highly customizable
+   Login/Password protection
+   Mobile devices compatible
+   Includes debug web apps
+     GPIO Header
+     GPIO List
+     Serial Monitor
+     Devices Monitor
+   Javascript client library built on top of jQuery
+   Python client library with HTTP and CoAP support
+
+===What for===
+   Use webiopi.GPIO library to control GPIO in your Python scripts
+   Use devices drivers to interact with DAC, ADC, sensors and more in your Python scripts
+   Use Serial, I2C and SPI webiopi classes in your Python scripts
+   Use the GPIO Header web-app to play with GPIO and debug circuits
+   Use the Serial Monitor web-app to debug Serial devices
+   Use the Devices Monitor web-app to debug devices like DAC, ADC, sensors and more
+   Create a web-app with the Javascript library to remote controls things connected on GPIO
+   Add webiopi in your existing Python script to simply add all WebIOPi features
+   Extends webiopi with your own macro
+   Extends webiopi with scripts loading facilities in a Arduino fashion way (setup, loop, destroy)
+   Use the Python Client to make Pi-2-Pi communication through the REST API
+   Use the Python Multicast Client to control multiple Pis with a single REST call
+   Use the Java Client to use the REST API from a Java application, including Android
+   Use the REST API from any technology/language
+
+===Where to start===
+   [INSTALL Installation]
+   [http://groups.google.com/group/webiopi Support & Discussion]
+   [http://trouch.com Developer's Blog (Eric/trouch)]
+   [http://issuu.com/themagpi/docs/issue9final?mode=window WebRobotCam Part 1 in MagPi #9] by Eric
+   [http://issuu.com/themagpi/docs/issue10final?mode=window WebRobotCam Part 2 in MagPi #10] by Eric
+   [http://www.youtube.com/watch?v=wGahWkjettw Video tutorial] by RaspberryPiBeginners
+
+<p></p>
+
+http://trouch.com/wp-content/uploads/2012/11/webiopi-architecture.png
+
+http://trouch.com/wp-content/uploads/2012/08/webiopi-chrome.png
+
+http://trouch.com/wp-content/uploads/2013/03/webiopi-0.6-serialmon.png
+
+http://trouch.com/wp-content/uploads/2013/03/webiopi-0.6-devices1.png
+
+<p></p>
+
+<p align="center"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=s-xclick&hostedbuttonid=79EM7ZV9FQ4HU">https://www.paypal.com/enUS/i/btn/btndonateCCLG.gif</a></p>
\ No newline at end of file
diff --git a/doc/updatedoc b/doc/updatedoc
new file mode 100755
index 0000000..aa0e5bc
--- /dev/null
+++ b/doc/updatedoc
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+if [ -z "$*" ]; then
+        files=`ls`
+else
+        files="$*"
+fi
+
+for file in $files; do
+        echo "Downloading $file..." 
+        wget -q http://webiopi.googlecode.com/svn/wiki/$file.wiki &&
+        echo "Processing $file..." &&
+        mv $file.wiki $file &&
+        sed -i 's/<font color="red">\|<\/font>//g' $file &&
+        sed -i 's/<pre>\|<\/pre>//g' $file &&
+        sed -i 's/[_*]//g' $file &&
+        sed -i '/{{{\|}}}/d' $file &&
+        echo "$file OK" ||
+        echo "$file not on wiki"
+done
+
+echo "Uploading changes on SVN..."
+svn commit -m "updated doc from wiki"
\ No newline at end of file
diff --git a/examples/clients/coap-client.py b/examples/clients/coap-client.py
new file mode 100644
index 0000000..eba80e9
--- /dev/null
+++ b/examples/clients/coap-client.py
@@ -0,0 +1,15 @@
+from webiopi.protocols.coap import *
+from time import sleep
+
+client = COAPClient()
+client.sendRequest(COAPPost("coap://224.0.1.123/GPIO/25/function/out"))
+state = True
+
+while True: 
+    response = client.sendRequest(COAPPost("coap://224.0.1.123/GPIO/25/value/%d" % state))
+    if response:
+        print("Received response:\n%s" % response)
+        state = not state
+    else:
+        print("No response received")
+    sleep(0.5)
diff --git a/examples/clients/webiopi-client.py b/examples/clients/webiopi-client.py
new file mode 100644
index 0000000..c277682
--- /dev/null
+++ b/examples/clients/webiopi-client.py
@@ -0,0 +1,46 @@
+from webiopi.clients import *
+from time import sleep
+
+# Create a WebIOPi client
+client = PiHttpClient("192.168.1.234")
+#client = PiMixedClient("192.168.1.234")
+#client = PiCoapClient("192.168.1.234")
+#client = PiMulticastClient()
+
+client.setCredentials("webiopi", "raspberry")
+
+# RPi native GPIO
+gpio = NativeGPIO(client)
+gpio.setFunction(25, "out")
+state = True
+
+# DAC named "dac1"
+dac = DAC(client, "dac1")
+
+# ADC named "adc1"
+adc = ADC(client, "adc1")
+value = 0.0
+
+# Temperature sensor named "temp0"
+temp = Temperature(client, "temp0")
+
+while True:
+    # toggle digital state
+    state = not state
+    gpio.digitalWrite(25, state)
+
+    # increase analog value
+    value += 0.01
+    if value > 1.0:
+        value = 0.0
+    dac.writeFloat(0, value)
+
+    # DAC output 0 is wired to ADC input 1
+    val = adc.readFloat(1)
+    print("Analog = %.2f" % val)
+    
+    # Retrieve temperature
+    t = temp.getCelsius()
+    print("Temperature = %.2f Celsius" % t)
+
+    sleep(1)
diff --git a/examples/magpi-9-cambot/cambot.py b/examples/magpi-9-cambot/cambot.py
new file mode 100644
index 0000000..ed2e499
--- /dev/null
+++ b/examples/magpi-9-cambot/cambot.py
@@ -0,0 +1,139 @@
+# Imports
+import webiopi
+
+# Retrieve GPIO lib
+GPIO = webiopi.GPIO
+
+# -------------------------------------------------- #
+# Constants definition                               #
+# -------------------------------------------------- #
+
+# Left motor GPIOs
+L1=9  # H-Bridge 1
+L2=10 # H-Bridge 2
+LS=11 # H-Bridge 1,2EN
+
+# Right motor GPIOs
+R1=23 # H-Bridge 3
+R2=24 # H-Bridge 4
+RS=25 # H-Bridge 3,4EN
+
+# -------------------------------------------------- #
+# Convenient PWM Function                            #
+# -------------------------------------------------- #
+
+# Set the speed of two motors
+def set_speed(speed):
+    GPIO.pulseRatio(LS, speed)
+    GPIO.pulseRatio(RS, speed)
+
+# -------------------------------------------------- #
+# Left Motor Functions                               #
+# -------------------------------------------------- #
+
+def left_stop():
+    GPIO.output(L1, GPIO.LOW)
+    GPIO.output(L2, GPIO.LOW)
+
+def left_forward():
+    GPIO.output(L1, GPIO.HIGH)
+    GPIO.output(L2, GPIO.LOW)
+
+def left_backward():
+    GPIO.output(L1, GPIO.LOW)
+    GPIO.output(L2, GPIO.HIGH)
+
+# -------------------------------------------------- #
+# Right Motor Functions                              #
+# -------------------------------------------------- #
+def right_stop():
+    GPIO.output(R1, GPIO.LOW)
+    GPIO.output(R2, GPIO.LOW)
+
+def right_forward():
+    GPIO.output(R1, GPIO.HIGH)
+    GPIO.output(R2, GPIO.LOW)
+
+def right_backward():
+    GPIO.output(R1, GPIO.LOW)
+    GPIO.output(R2, GPIO.HIGH)
+
+# -------------------------------------------------- #
+# Macro definition part                              #
+# -------------------------------------------------- #
+
+def go_forward():
+    left_forward()
+    right_forward()
+
+def go_backward():
+    left_backward()
+    right_backward()
+
+def turn_left():
+    left_backward()
+    right_forward()
+
+def turn_right():
+    left_forward()
+    right_backward()
+
+def stop():
+    left_stop()
+    right_stop()
+    
+# -------------------------------------------------- #
+# Initialization part                                #
+# -------------------------------------------------- #
+
+# Setup GPIOs
+GPIO.setFunction(LS, GPIO.PWM)
+GPIO.setFunction(L1, GPIO.OUT)
+GPIO.setFunction(L2, GPIO.OUT)
+
+GPIO.setFunction(RS, GPIO.PWM)
+GPIO.setFunction(R1, GPIO.OUT)
+GPIO.setFunction(R2, GPIO.OUT)
+
+set_speed(0.5)
+stop()
+
+# -------------------------------------------------- #
+# Main server part                                   #
+# -------------------------------------------------- #
+
+
+# Instantiate the server on the port 8000, it starts immediately in its own thread
+server = webiopi.Server(port=8000, login="cambot", password="cambot")
+
+# Register the macros so you can call it with Javascript and/or REST API
+
+server.addMacro(go_forward)
+server.addMacro(go_backward)
+server.addMacro(turn_left)
+server.addMacro(turn_right)
+server.addMacro(stop)
+
+# -------------------------------------------------- #
+# Loop execution part                                #
+# -------------------------------------------------- #
+
+# Run our loop until CTRL-C is pressed or SIGTERM received
+webiopi.runLoop()
+
+# -------------------------------------------------- #
+# Termination part                                   #
+# -------------------------------------------------- #
+
+# Stop the server
+server.stop()
+
+# Reset GPIO functions
+GPIO.setFunction(LS, GPIO.IN)
+GPIO.setFunction(L1, GPIO.IN)
+GPIO.setFunction(L2, GPIO.IN)
+
+GPIO.setFunction(RS, GPIO.IN)
+GPIO.setFunction(R1, GPIO.IN)
+GPIO.setFunction(R2, GPIO.IN)
+
diff --git a/examples/magpi-9-cambot/index.html b/examples/magpi-9-cambot/index.html
new file mode 100644
index 0000000..db69b41
--- /dev/null
+++ b/examples/magpi-9-cambot/index.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content = "height = device-height, width = 420, user-scalable = no" /> 
+        <title>CamBot</title>
+        <script type="text/javascript" src="/webiopi.js"></script>
+        <script type="text/javascript">
+        function init() {
+                var button;
+                        
+                button = webiopi().createButton("bt_up", "/\\", go_forward, stop);
+                $("#up").append(button);
+                
+                button = webiopi().createButton("bt_left", "<", turn_left, stop);
+                $("#middle").append(button);
+                
+                button = webiopi().createButton("bt_stop", "X", stop);
+                $("#middle").append(button);
+                
+                button = webiopi().createButton("bt_right", ">", turn_right, stop);
+                $("#middle").append(button);
+                
+                button = webiopi().createButton("bt_down", "\\/", go_backward, stop);
+                $("#down").append(button);
+        }
+        
+        function go_forward() {
+                webiopi().callMacro("go_forward");
+        }
+                
+        function go_backward() {
+                webiopi().callMacro("go_backward");
+        }
+                
+        function turn_right() {
+                webiopi().callMacro("turn_right");
+        }
+                
+        function turn_left() {
+                webiopi().callMacro("turn_left");
+        }
+                
+        function stop() {
+                webiopi().callMacro("stop");
+        }
+        
+        webiopi().ready(init);
+                
+        </script>
+        <style type="text/css">
+                button {
+                        margin: 5px 5px 5px 5px;
+                        width: 50px;
+                        height: 50px;
+                        font-size: 24pt;
+                        font-weight: bold;
+                        color: black;
+                }
+        </style>
+</head>
+<body>
+        <div id="content" align="center">
+                <img width="320" height="240" src="http://raspberrypi:8001/?action=stream"><br/>
+                <div id="up"></div>
+                <div id="middle"></div>
+                <div id="down"></div>
+        </div>
+</body>
+</html>
diff --git a/examples/magpi-9-cambot/stream.sh b/examples/magpi-9-cambot/stream.sh
new file mode 100755
index 0000000..12d6579
--- /dev/null
+++ b/examples/magpi-9-cambot/stream.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+STREAMER=mjpg_streamer
+DEVICE=/dev/video0
+RESOLUTION=320x240
+FRAMERATE=25
+HTTP_PORT=8001
+
+PLUGINPATH=/usr/local/lib
+
+$STREAMER -i "$PLUGINPATH/input_uvc.so -n -d $DEVICE -r $RESOLUTION -f $FRAMERATE" -o "$PLUGINPATH/output_http.so -n -p $HTTP_PORT"
diff --git a/examples/magpi-9-cambot2/cambot.py b/examples/magpi-9-cambot2/cambot.py
new file mode 100644
index 0000000..f1013ab
--- /dev/null
+++ b/examples/magpi-9-cambot2/cambot.py
@@ -0,0 +1,117 @@
+# This version uses new-style automatic setup/destroy/mapping
+# Need to change /etc/webiopi
+
+# Imports
+import webiopi
+
+# Retrieve GPIO lib
+GPIO = webiopi.GPIO
+
+# -------------------------------------------------- #
+# Constants definition                               #
+# -------------------------------------------------- #
+
+# Left motor GPIOs
+L1=17 # H-Bridge 1
+L2=18 # H-Bridge 2
+LS=21 # H-Bridge 1,2EN
+
+# Right motor GPIOs
+R1=23 # H-Bridge 3
+R2=24 # H-Bridge 4
+RS=25 # H-Bridge 3,4EN
+
+# -------------------------------------------------- #
+# Convenient PWM Function                            #
+# -------------------------------------------------- #
+
+# Set the speed of two motors
+def set_speed(speed):
+    GPIO.pulseRatio(LS, speed)
+    GPIO.pulseRatio(RS, speed)
+
+# -------------------------------------------------- #
+# Left Motor Functions                               #
+# -------------------------------------------------- #
+
+def left_stop():
+    GPIO.output(L1, GPIO.LOW)
+    GPIO.output(L2, GPIO.LOW)
+
+def left_forward():
+    GPIO.output(L1, GPIO.HIGH)
+    GPIO.output(L2, GPIO.LOW)
+
+def left_backward():
+    GPIO.output(L1, GPIO.LOW)
+    GPIO.output(L2, GPIO.HIGH)
+
+# -------------------------------------------------- #
+# Right Motor Functions                              #
+# -------------------------------------------------- #
+def right_stop():
+    GPIO.output(R1, GPIO.LOW)
+    GPIO.output(R2, GPIO.LOW)
+
+def right_forward():
+    GPIO.output(R1, GPIO.HIGH)
+    GPIO.output(R2, GPIO.LOW)
+
+def right_backward():
+    GPIO.output(R1, GPIO.LOW)
+    GPIO.output(R2, GPIO.HIGH)
+
+# -------------------------------------------------- #
+# Macro definition part                              #
+# -------------------------------------------------- #
+@webiopi.macro
+def go_forward():
+    left_forward()
+    right_forward()
+
+@webiopi.macro
+def go_backward():
+    left_backward()
+    right_backward()
+
+@webiopi.macro
+def turn_left():
+    left_backward()
+    right_forward()
+
+@webiopi.macro
+def turn_right():
+    left_forward()
+    right_backward()
+
+@webiopi.macro
+def stop():
+    left_stop()
+    right_stop()
+    
+# Called by WebIOPi at script loading
+def setup():
+    # Setup GPIOs
+    GPIO.setFunction(LS, GPIO.PWM)
+    GPIO.setFunction(L1, GPIO.OUT)
+    GPIO.setFunction(L2, GPIO.OUT)
+    
+    GPIO.setFunction(RS, GPIO.PWM)
+    GPIO.setFunction(R1, GPIO.OUT)
+    GPIO.setFunction(R2, GPIO.OUT)
+    
+    set_speed(0.5)
+    stop()
+
+
+# Called by WebIOPi at server shutdown
+def destroy():
+    # Reset GPIO functions
+    GPIO.setFunction(LS, GPIO.IN)
+    GPIO.setFunction(L1, GPIO.IN)
+    GPIO.setFunction(L2, GPIO.IN)
+    
+    GPIO.setFunction(RS, GPIO.IN)
+    GPIO.setFunction(R1, GPIO.IN)
+    GPIO.setFunction(R2, GPIO.IN)
+    
diff --git a/examples/magpi-9-cambot2/index.html b/examples/magpi-9-cambot2/index.html
new file mode 100644
index 0000000..db69b41
--- /dev/null
+++ b/examples/magpi-9-cambot2/index.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content = "height = device-height, width = 420, user-scalable = no" /> 
+        <title>CamBot</title>
+        <script type="text/javascript" src="/webiopi.js"></script>
+        <script type="text/javascript">
+        function init() {
+                var button;
+                        
+                button = webiopi().createButton("bt_up", "/\\", go_forward, stop);
+                $("#up").append(button);
+                
+                button = webiopi().createButton("bt_left", "<", turn_left, stop);
+                $("#middle").append(button);
+                
+                button = webiopi().createButton("bt_stop", "X", stop);
+                $("#middle").append(button);
+                
+                button = webiopi().createButton("bt_right", ">", turn_right, stop);
+                $("#middle").append(button);
+                
+                button = webiopi().createButton("bt_down", "\\/", go_backward, stop);
+                $("#down").append(button);
+        }
+        
+        function go_forward() {
+                webiopi().callMacro("go_forward");
+        }
+                
+        function go_backward() {
+                webiopi().callMacro("go_backward");
+        }
+                
+        function turn_right() {
+                webiopi().callMacro("turn_right");
+        }
+                
+        function turn_left() {
+                webiopi().callMacro("turn_left");
+        }
+                
+        function stop() {
+                webiopi().callMacro("stop");
+        }
+        
+        webiopi().ready(init);
+                
+        </script>
+        <style type="text/css">
+                button {
+                        margin: 5px 5px 5px 5px;
+                        width: 50px;
+                        height: 50px;
+                        font-size: 24pt;
+                        font-weight: bold;
+                        color: black;
+                }
+        </style>
+</head>
+<body>
+        <div id="content" align="center">
+                <img width="320" height="240" src="http://raspberrypi:8001/?action=stream"><br/>
+                <div id="up"></div>
+                <div id="middle"></div>
+                <div id="down"></div>
+        </div>
+</body>
+</html>
diff --git a/examples/magpi-9-cambot2/stream.sh b/examples/magpi-9-cambot2/stream.sh
new file mode 100755
index 0000000..12d6579
--- /dev/null
+++ b/examples/magpi-9-cambot2/stream.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+STREAMER=mjpg_streamer
+DEVICE=/dev/video0
+RESOLUTION=320x240
+FRAMERATE=25
+HTTP_PORT=8001
+
+PLUGINPATH=/usr/local/lib
+
+$STREAMER -i "$PLUGINPATH/input_uvc.so -n -d $DEVICE -r $RESOLUTION -f $FRAMERATE" -o "$PLUGINPATH/output_http.so -n -p $HTTP_PORT"
diff --git a/examples/scripts/basic/script.py b/examples/scripts/basic/script.py
new file mode 100644
index 0000000..5750a69
--- /dev/null
+++ b/examples/scripts/basic/script.py
@@ -0,0 +1,34 @@
+# Imports
+import webiopi
+
+# Enable debug output
+webiopi.setDebug()
+
+# Retrieve GPIO lib
+GPIO = webiopi.GPIO
+SWITCH = 21
+SERVO  = 23
+LED0   = 24
+LED1   = 25
+
+# Called by WebIOPi at script loading
+def setup():
+    webiopi.debug("Basic script - Setup")
+    # Setup GPIOs
+    GPIO.setFunction(SWITCH, GPIO.IN)
+    GPIO.setFunction(SERVO, GPIO.PWM)
+    GPIO.setFunction(LED0, GPIO.PWM)
+    GPIO.setFunction(LED1, GPIO.OUT)
+    
+    GPIO.pwmWrite(LED0, 0.5)        # set to 50% ratio
+    GPIO.pwmWriteAngle(SERVO, 0)    # set to 0 (neutral)
+    GPIO.digitalWrite(LED1, GPIO.HIGH)
+
+# Called by WebIOPi at server shutdown
+def destroy():
+    webiopi.debug("Basic script - Destroy")
+    # Reset GPIO functions
+    GPIO.setFunction(SWITCH, GPIO.IN)
+    GPIO.setFunction(SERVO, GPIO.IN)
+    GPIO.setFunction(LED0, GPIO.IN)
+    GPIO.setFunction(LED1, GPIO.IN)
diff --git a/examples/scripts/blink/script.py b/examples/scripts/blink/script.py
new file mode 100644
index 0000000..90c6c8c
--- /dev/null
+++ b/examples/scripts/blink/script.py
@@ -0,0 +1,41 @@
+# Imports
+import webiopi
+
+# Enable debug output
+webiopi.setDebug()
+
+# Retrieve GPIO lib
+GPIO = webiopi.GPIO
+SWITCH = 21
+SERVO  = 23
+LED0   = 24
+LED1   = 25
+
+# Called by WebIOPi at script loading
+def setup():
+    webiopi.debug("Blink script - Setup")
+    # Setup GPIOs
+    GPIO.setFunction(SWITCH, GPIO.IN)
+    GPIO.setFunction(SERVO, GPIO.PWM)
+    GPIO.setFunction(LED0, GPIO.PWM)
+    GPIO.setFunction(LED1, GPIO.OUT)
+    
+    GPIO.pwmWrite(LED0, 0.5)      # set to 50% ratio
+    GPIO.pwmWriteAngle(SERVO, 0)    # set to 0 (neutral)
+    GPIO.digitalWrite(LED1, GPIO.HIGH)
+
+# Looped by WebIOPi
+def loop():
+    # Toggle LED each 5 seconds
+    value = not GPIO.digitalRead(LED1)
+    GPIO.digitalWrite(LED1, value)
+    webiopi.sleep(5)        
+
+# Called by WebIOPi at server shutdown
+def destroy():
+    webiopi.debug("Blink script - Destroy")
+    # Reset GPIO functions
+    GPIO.setFunction(SWITCH, GPIO.IN)
+    GPIO.setFunction(SERVO, GPIO.IN)
+    GPIO.setFunction(LED0, GPIO.IN)
+    GPIO.setFunction(LED1, GPIO.IN)
diff --git a/examples/scripts/macros/index.html b/examples/scripts/macros/index.html
new file mode 100644
index 0000000..2dc118e
--- /dev/null
+++ b/examples/scripts/macros/index.html
@@ -0,0 +1,120 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content = "height = device-height, width = 420, user-scalable = no" /> 
+        <title>WebIOPi | Demo</title>
+        <script type="text/javascript" src="/webiopi.js"></script>
+        <script type="text/javascript">
+        webiopi().ready(function() {
+                var content, button;
+                content = $("#content");
+                        
+                // create a "SWITCH" labeled button for GPIO 21
+                button = webiopi().createGPIOButton(21, "SWITCH");
+                content.append(button); // append button to content div
+                               
+                // create a "LED" labeled button for GPIO 25
+                button = webiopi().createGPIOButton(25, "LED1");
+                content.append(button); // append button to content div
+                       
+                // create a button that output a single pulse
+                button = webiopi().createPulseButton("pulse", "Pulse", 25);
+                content.append(button); // append button to content div
+                
+                // create a button which output a bit sequence on GPIO 25 with a 100ms period 
+                button = webiopi().createSequenceButton("sos", "S.O.S 1", 25, 100, "01010100110011001100101010");
+                content.append(button); // append button to content div
+                       
+                // the previous button will always output the same sequence
+                // you can also create a simple button with your own function 
+                button = webiopi().createButton("sos2", "S.O.S 2", outputSequence);
+                content.append(button); // append button to content div
+                
+                // create a button which call PrintTime
+                button = webiopi().createMacroButton("macro", "Print Time", "PrintTime");
+                content.append(button); // append button to content div
+                
+                // create a button which call HelloWorld with "User,Name" argument
+                button = webiopi().createMacroButton("macro", "Hello ?", "HelloWorld", ["User", "Name"]);
+                content.append(button); // append button to content div
+                
+                // the previous button will always call HelloWorld with "User,Name" argument
+                // you can also create a simple button with your own function 
+                button = webiopi().createButton("macro2", "Hello !", callMacro);
+                content.append(button); // append button to content div
+                
+                // you can also create a button which calls a different function for mouse down and up events
+                button = webiopi().createButton("hold", "Hold", mousedown, mouseup);
+                content.append(button);
+                
+                // Only for Chrome and Safari, create a slider that pulse out a -45 to +45° angle on GPIO 23
+                button = webiopi().createAngleSlider(23);
+                content.append(button);
+
+                // Only for Chrome and Safari, create a slider that pulse out a 0-100% duty cycle ratio on GPIO 24
+                button = webiopi().createRatioSlider(24);
+                content.append(button);
+                
+                webiopi().refreshGPIO(true);
+        });
+                
+        function mousedown() {
+                webiopi().digitalWrite(25, 1);
+        }
+        
+        function mouseup() {
+                webiopi().digitalWrite(25, 0);
+        }
+        
+        function outputSequence() {
+                var sequence = "01010100110011001100101010" // S.O.S. morse code or whatever you want
+                // output sequence on gpio 25 with a 100ms period
+                webiopi().outputSequence(25, 100, sequence, sequenceCallback);
+        }
+        
+        function sequenceCallback(gpio, data) {
+                alert("sequence on " + gpio + " finished with " + data);
+        }
+        
+        function callMacro() {
+                var args = ["User","Name"] // or whatever you want
+                // call HelloWorld(args)
+                webiopi().callMacro("HelloWorld", args, macroCallback);
+        }
+        
+        function macroCallback(macro, args, data) {
+                alert(data);
+        }
+        
+        </script>
+        <style type="text/css">
+                button {
+                        display: block;
+                        margin: 5px 5px 5px 5px;
+                        width: 160px;
+                        height: 45px;
+                        font-size: 24pt;
+                        font-weight: bold;
+                        color: black;
+                }
+                
+                input[type="range"] {
+                        display: block;
+                        width: 160px;
+                        height: 45px;
+                }
+                
+                .LOW {
+                        background-color: White;
+                }
+                
+                .HIGH {
+                        background-color: Red;
+                }
+        </style>
+</head>
+<body>
+        <div id="content" align="center"></div>
+</body>
+</html>
diff --git a/examples/scripts/macros/script.py b/examples/scripts/macros/script.py
new file mode 100644
index 0000000..a469b1a
--- /dev/null
+++ b/examples/scripts/macros/script.py
@@ -0,0 +1,60 @@
+# Imports
+import webiopi
+import time
+
+# Enable debug output
+webiopi.setDebug()
+
+# Retrieve GPIO lib
+GPIO = webiopi.GPIO
+
+SWITCH = 21
+SERVO  = 23
+LED0   = 24
+LED1   = 25
+
+# Called by WebIOPi at script loading
+def setup():
+    webiopi.debug("Script with macros - Setup")
+    # Setup GPIOs
+    GPIO.setFunction(SWITCH, GPIO.IN)
+    GPIO.setFunction(SERVO, GPIO.PWM)
+    GPIO.setFunction(LED0, GPIO.PWM)
+    GPIO.setFunction(LED1, GPIO.OUT)
+    
+    GPIO.pwmWrite(LED0, 0.5)        # set to 50% ratio
+    GPIO.pwmWriteAngle(SERVO, 0)    # set to 0 (neutral)
+    GPIO.digitalWrite(LED1, GPIO.HIGH)
+    
+    gpio0 = webiopi.deviceInstance("gpio0")
+    gpio0.digitalWrite(0, 0)
+
+# Looped by WebIOPi
+def loop():
+    # Toggle LED each 5 seconds
+    value = not GPIO.digitalRead(LED1)
+    GPIO.digitalWrite(LED1, value)
+    webiopi.sleep(5)        
+
+# Called by WebIOPi at server shutdown
+def destroy():
+    webiopi.debug("Script with macros - Destroy")
+    # Reset GPIO functions
+    GPIO.setFunction(SWITCH, GPIO.IN)
+    GPIO.setFunction(SERVO, GPIO.IN)
+    GPIO.setFunction(LED0, GPIO.IN)
+    GPIO.setFunction(LED1, GPIO.IN)
+    gpio0 = webiopi.deviceInstance("gpio0")
+    gpio0.digitalWrite(0, 1)
+
+# A macro which says hello
+@webiopi.macro
+def HelloWorld(first, last):
+    webiopi.debug("HelloWorld(%s, %s)" % (first, last))
+    return "Hello %s %s !" % (first, last)
+
+# A macro without args which return nothing
+@webiopi.macro
+def PrintTime():
+    webiopi.debug("PrintTime: " + time.asctime())
+
diff --git a/examples/scripts/simple/index.html b/examples/scripts/simple/index.html
new file mode 100644
index 0000000..516ecbe
--- /dev/null
+++ b/examples/scripts/simple/index.html
@@ -0,0 +1,68 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content = "height = device-height, width = 420, user-scalable = no" /> 
+        <title>WebIOPi | Demo</title>
+        <script type="text/javascript" src="/webiopi.js"></script>
+        <script type="text/javascript">
+        webiopi().ready(function() {
+                webiopi().setFunction(25, "out");
+
+                var content, button;
+                content = $("#content");
+                        
+                // create a "LED" labeled button for GPIO 25
+                button = webiopi().createGPIOButton(25, "LED1");
+                content.append(button); // append button to content div
+                       
+                // create a button that output a single pulse
+                button = webiopi().createPulseButton("pulse", "Pulse", 25);
+                content.append(button); // append button to content div
+                
+                // you can also create a button which calls a different function for mouse down and up events
+                button = webiopi().createButton("hold", "Hold", mousedown, mouseup);
+                content.append(button);
+                
+                webiopi().refreshGPIO(true);
+        });
+                
+        function mousedown() {
+                webiopi().digitalWrite(25, 1);
+        }
+        
+        function mouseup() {
+                webiopi().digitalWrite(25, 0);
+        }
+        
+        </script>
+        <style type="text/css">
+                button {
+                        display: block;
+                        margin: 5px 5px 5px 5px;
+                        width: 160px;
+                        height: 45px;
+                        font-size: 24pt;
+                        font-weight: bold;
+                        color: black;
+                }
+                
+                input[type="range"] {
+                        display: block;
+                        width: 160px;
+                        height: 45px;
+                }
+                
+                .LOW {
+                        background-color: White;
+                }
+                
+                .HIGH {
+                        background-color: Red;
+                }
+        </style>
+</head>
+<body>
+        <div id="content" align="center"></div>
+</body>
+</html>
diff --git a/htdocs/app/devices-monitor/index.html b/htdocs/app/devices-monitor/index.html
new file mode 100644
index 0000000..6e969dc
--- /dev/null
+++ b/htdocs/app/devices-monitor/index.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content = "height = device-height, width = 420, user-scalable = no" /> 
+        <title>WebIOPi | Devices Monitor</title>
+        <script type="text/javascript" src="/webiopi.js"></script>
+        <script type="text/javascript">
+        webiopi().ready(function() {
+                $.get("/devices/*", function(data) {
+                        var content = $("#content");
+                        for (i in data) {
+                                if (data[i].type != "Serial") {
+                                        var device = webiopi().newDevice(data[i].type, data[i].name);
+                                        if (device) {
+                                                device.element = $("<div>");
+                                                content.append(device.element);
+                                                device.refreshUI();
+                                        }
+                                }
+                        }
+                });
+        });
+        </script>
+        <style type="text/css">
+        button, .FunctionBasic {
+                width: 50px;
+        }
+        </style>
+</head>
+<body>
+<h1>Devices Monitor</h1>
+<div id="content">
+</div>
+</body>
+</html>
diff --git a/htdocs/app/gpio-header/index.html b/htdocs/app/gpio-header/index.html
new file mode 100644
index 0000000..0634b1e
--- /dev/null
+++ b/htdocs/app/gpio-header/index.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content = "height = device-height, width = 420, user-scalable = no" /> 
+        <title>WebIOPi | GPIO Header</title>
+        <script type="text/javascript" src="/webiopi.js"></script>
+        <script type="text/javascript">
+        webiopi().ready(function() {
+                webiopi().RPiHeader().createTable("content");
+                w().refreshGPIO(true);
+        });
+        </script>
+</head>
+<body>
+<div id="content" align="center"></div>
+</body>
+</html>
diff --git a/htdocs/app/gpio-list/index.html b/htdocs/app/gpio-list/index.html
new file mode 100644
index 0000000..6c0cf1a
--- /dev/null
+++ b/htdocs/app/gpio-list/index.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content = "height = device-height, width = 420, user-scalable = no" /> 
+        <title>WebIOPi | GPIO List</title>
+        <script type="text/javascript" src="/webiopi.js"></script>
+        <script type="text/javascript">
+        webiopi().ready(function() {
+                webiopi().Expert().createList("content");
+                w().refreshGPIO(true);
+        });
+        </script>
+        <style type="text/css">
+        button {
+                margin: 2px 2px 2px 2px;
+                width: 50px;
+        }
+        
+        .Description {
+                display: inline;
+        }
+        </style>
+</head>
+<body>
+<div id="content"></div>
+</body>
+</html>
diff --git a/htdocs/app/serial-monitor/index.html b/htdocs/app/serial-monitor/index.html
new file mode 100644
index 0000000..cdc8524
--- /dev/null
+++ b/htdocs/app/serial-monitor/index.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content = "height = device-height, width = 420, user-scalable = no" /> 
+        <title>WebIOPi | Serial Monitor</title>
+        <script type="text/javascript" src="/webiopi.js"></script>
+        <script type="text/javascript">
+        webiopi().ready(function() {
+                $("#inputText").keyup(function(event){
+                    if(event.keyCode == 13){
+                        sendData();
+                    }
+                });
+                $.get("/devices/*", function(data) {
+                        var devices = $("#devices");
+                        var added = false;
+                        for (i in data) {
+                                if (data[i].type=="Serial") {
+                                        added = true;
+                                        devices.append($("<option>" + data[i].name + "</option>"))
+                                }
+                        }
+                        if (added) {
+                                readData();
+                        }
+                });
+        });
+        
+        function readData() {
+                webiopi().Serial($("#devices").val()).read(function(data) {
+                        if (data.length > 0) {
+                                var d = $("#output").text() + data;
+                                $("#output").text(d);
+                        }
+                });
+                setTimeout(readData, 500);
+        }
+        
+        function sendData() {
+                var data = $("#inputText").val() + "\n";
+                webiopi().Serial($("#devices").val()).write(data);
+                $("#inputText").val("");
+        }
+        
+        function deviceChanged() {
+                $("#output").text("");
+        }
+        
+        </script>
+        <style type="text/css">
+                #inputText {
+                        width: 550px;
+                }
+        </style>
+</head>
+<body>
+<h1>Serial Monitor</h1>
+<span>Serial device : </span><select id="devices" onchange="deviceChanged()"></select><br/>
+<span>Input : </span><br/>
+<textarea id="output" rows="30" cols="100" disabled="disabled"></textarea><br/>
+<span>Output : </span><input id="inputText" type="text"/>
+</body>
+</html>
diff --git a/htdocs/index.html b/htdocs/index.html
new file mode 100644
index 0000000..68c49c9
--- /dev/null
+++ b/htdocs/index.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content = "height = device-height, width = 420, user-scalable = no" /> 
+        <title>WebIOPi | Raspberry Pi IoT Framework</title>
+</head>
+<body>
+
+<h1>WebIOPi Main Menu</h1>
+
+<h2><a href="/app/gpio-header">GPIO Header</a></h2>
+<p>Control and Debug the Raspberry Pi GPIO with a display which looks like the physical header.</p>
+
+<h2><a href="/app/gpio-list">GPIO List</a></h2>
+<p>Control and Debug the Raspberry Pi GPIO ordered in a single column.</p>
+
+<h2><a href="/app/serial-monitor">Serial Monitor</a></h2>
+<p>Use the browser to play with Serial interfaces configured in WebIOPi.</p>
+
+<h2><a href="/app/devices-monitor">Devices Monitor</a></h2>
+<p>Control and Debug devices and circuits wired to your Pi and configured in WebIOPi.</p>
+
+</body>
+</html>
diff --git a/htdocs/jquery-mobile.css b/htdocs/jquery-mobile.css
new file mode 100644
index 0000000..3a52bf0
--- /dev/null
+++ b/htdocs/jquery-mobile.css
@@ -0,0 +1,2 @@
+/*! jQuery Mobile vGit Build: SHA1: b49cc06499abf8f987cf90f35349cfac0918c939 <> Date: Tue Oct 2 11:22:34 2012 -0700 jquerymobile.com | jquery.org/license !*/
+.ui-mobile,.ui-mobile body{height:99.9%}.ui-mobile fieldset,.ui-page{padding:0;margin:0}.ui-mobile a img,.ui-mobile fieldset{border-width:0}.ui-mobile-viewport{margin:0;overflow-x:visible;-webkit-text-size-adjust:100%;-ms-text-size-adjust:none;-webkit-tap-highlight-color:rgba(0,0,0,0)}body.ui-mobile-viewport,div.ui-mobile-viewport{overflow-x:hidden}.ui-mobile [data-role=page],.ui-mobile [data-role=dialog],.ui-page{top:0;left:0;width:100%;min-height:100%;position:absolute;display:none;border:0}.ui-mobile .ui-page-active{display:block;overflow:visible}.ui-page{outline:none}@media screen and (orientation:portrait){.ui-mobile,.ui-mobile .ui-page{min-height:420px}}@media screen and (orientation:landscape){.ui-mobile,.ui-mobile .ui-page{min-height:300px}}.ui-loading .ui-loader{display:block}.ui-loader{display:none;z-index:9999999;position:fixed;top:50%;left:50%;border:0}.ui-loader-default{background:none;filter:Alpha(Opacity=18);opacity:.18;width:46px;height:46px;margin-left:-23px;margin-top:-23px}.ui-loader-verbose{width:200px;filter:Alpha(Opacity=88);opacity:.88;box-shadow:0 1px 1px -1px #fff;height:auto;margin-left:-110px;margin-top:-43px;padding:10px}.ui-loader-default h1{font-size:0;width:0;height:0;overflow:hidden}.ui-loader-verbose h1{font-size:16px;margin:0;text-align:center}.ui-loader .ui-icon{background-color:#000;display:block;margin:0;width:44px;height:44px;padding:1px;-webkit-border-radius:36px;-moz-border-radius:36px;border-radius:36px}.ui-loader-verbose .ui-icon{margin:0 auto 10px;filter:Alpha(Opacity=75);opacity:.75}.ui-loader-textonly{padding:15px;margin-left:-115px}.ui-loader-textonly .ui-icon{display:none}.ui-loader-fakefix{position:absolute}.ui-mobile-rendering > *{visibility:hidden}.ui-bar,.ui-body{position:relative;padding:.4em 15px;overflow:hidden;display:block;clear:both}.ui-bar{font-size:16px;margin:0}.ui-bar h1,.ui-bar h2,.ui-bar h3,.ui-bar h4,.ui-bar h5,.ui-bar h6{margin:0;padding:0;font-size:16px;display:inline-block}.ui-header,.ui-footer{position:relative;border-left-width:0;border-right-width:0;zoom:1}.ui-header .ui-btn-left,.ui-header .ui-btn-right,.ui-footer .ui-btn-left,.ui-footer .ui-btn-right{position:absolute;top:3px}.ui-header .ui-btn-left,.ui-footer .ui-btn-left{left:5px}.ui-header .ui-btn-right,.ui-footer .ui-btn-right{right:5px}.ui-footer .ui-btn-icon-notext,.ui-header .ui-btn-icon-notext{top:6px}.ui-header .ui-title,.ui-footer .ui-title{min-height:1.1em;text-align:center;font-size:16px;display:block;margin:.6em 30% .8em;padding:0;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;outline:0!important}.ui-footer .ui-title{margin:.6em 15px .8em}.ui-content{border-width:0;overflow:visible;overflow-x:hidden;padding:15px}.ui-icon{width:18px;height:18px}.ui-nojs{position:absolute;left:-9999px}.ui-hide-label label.ui-input-text,.ui-hide-label label.ui-select,.ui-hide-label label.ui-slider,.ui-hide-label label.ui-submit,.ui-hide-label .ui-controlgroup-label,.ui-hidden-accessible{position:absolute!important;left:-9999px;clip:rect(1px);clip:rect(1px,1px,1px,1px)}.ui-mobile-viewport-transitioning,.ui-mobile-viewport-transitioning .ui-page{width:100%;height:100%;overflow:hidden;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.ui-page-pre-in{opacity:0}.in{-webkit-animation-timing-function:ease-out;-webkit-animation-duration:350ms;-moz-animation-timing-function:ease-out;-moz-animation-duration:350ms}.out{-webkit-animation-timing-function:ease-in;-webkit-animation-duration:225ms;-moz-animation-timing-function:ease-in;-moz-animation-duration:225ms}@-webkit-keyframes fadein{from{opacity:0}to{opacity:1}}@-moz-keyframes fadein{from{opacity:0}to{opacity:1}}@-webkit-keyframes fadeout{from{opacity:1}to{opacity:0}}@-moz-keyframes fadeout{from{opacity:1}to{opacity:0}}.fade.out{opacity:0;-webkit-animation-duration:125ms;-webkit-animation-name:fadeout;-moz-animation-duration:125ms;-moz-animation-name:fadeout}.fade.in{opacity:1;-webkit-animation-duration:225ms;-webkit-animation-name:fadein;-moz-animation-duration:225ms;-moz-animation-name:fadein}.pop{-webkit-transform-origin:50% 50%;-moz-transform-origin:50% 50%}.pop.in{-webkit-transform:scale(1);-moz-transform:scale(1);opacity:1;-webkit-animation-name:popin;-moz-animation-name:popin;-webkit-animation-duration:350ms;-moz-animation-duration:350ms}.pop.out{-webkit-animation-name:fadeout;-moz-animation-name:fadeout;opacity:0;-webkit-animation-duration:100ms;-moz-animation-duration:100ms}.pop.in.reverse{-webkit-animation-name:fadein;-moz-animation-name:fadein}.pop.out.reverse{-webkit-transform:scale(.8);-moz-transform:scale(.8);-webkit-animation-name:popout;-moz-animation-name:popout}@-webkit-keyframes popin{from{-webkit-transform:scale(.8);opacity:0}to{-webkit-transform:scale(1);opacity:1}}@-moz-keyframes popin{from{-moz-transform:scale(.8);opacity:0}to{-moz-transform:scale(1);opacity:1}}@-webkit-keyframes popout{from{-webkit-transform:scale(1);opacity:1}to{-webkit-transform:scale(.8);opacity:0}}@-moz-keyframes popout{from{-moz-transform:scale(1);opacity:1}to{-moz-transform:scale(.8);opacity:0}}@-webkit-keyframes slideinfromright{from{-webkit-transform:translateX(100%)}to{-webkit-transform:translateX(0)}}@-moz-keyframes slideinfromright{from{-moz-transform:translateX(100%)}to{-moz-transform:translateX(0)}}@-webkit-keyframes slideinfromleft{from{-webkit-transform:translateX(-100%)}to{-webkit-transform:translateX(0)}}@-moz-keyframes slideinfromleft{from{-moz-transform:translateX(-100%)}to{-moz-transform:translateX(0)}}@-webkit-keyframes slideouttoleft{from{-webkit-transform:translateX(0)}to{-webkit-transform:translateX(-100%)}}@-moz-keyframes slideouttoleft{from{-moz-transform:translateX(0)}to{-moz-transform:translateX(-100%)}}@-webkit-keyframes slideouttoright{from{-webkit-transform:translateX(0)}to{-webkit-transform:translateX(100%)}}@-moz-keyframes slideouttoright{from{-moz-transform:translateX(0)}to{-moz-transform:translateX(100%)}}.slide.out,.slide.in{-webkit-animation-timing-function:ease-out;-webkit-animation-duration:350ms;-moz-animation-timing-function:ease-out;-moz-animation-duration:350ms}.slide.out{-webkit-transform:translateX(-100%);-webkit-animation-name:slideouttoleft;-moz-transform:translateX(-100%);-moz-animation-name:slideouttoleft}.slide.in{-webkit-transform:translateX(0);-webkit-animation-name:slideinfromright;-moz-transform:translateX(0);-moz-animation-name:slideinfromright}.slide.out.reverse{-webkit-transform:translateX(100%);-webkit-animation-name:slideouttoright;-moz-transform:translateX(100%);-moz-animation-name:slideouttoright}.slide.in.reverse{-webkit-transform:translateX(0);-webkit-animation-name:slideinfromleft;-moz-transform:translateX(0);-moz-animation-name:slideinfromleft}.slidefade.out{-webkit-transform:translateX(-100%);-webkit-animation-name:slideouttoleft;-moz-transform:translateX(-100%);-moz-animation-name:slideouttoleft;-webkit-animation-duration:225ms;-moz-animation-duration:225ms}.slidefade.in{-webkit-transform:translateX(0);-webkit-animation-name:fadein;-moz-transform:translateX(0);-moz-animation-name:fadein;-webkit-animation-duration:200ms;-moz-animation-duration:200ms}.slidefade.out.reverse{-webkit-transform:translateX(100%);-webkit-animation-name:slideouttoright;-moz-transform:translateX(100%);-moz-animation-name:slideouttoright;-webkit-animation-duration:200ms;-moz-animation-duration:200ms}.slidefade.in.reverse{-webkit-transform:translateX(0);-webkit-animation-name:fadein;-moz-transform:translateX(0);-moz-animation-name:fadein;-webkit-animation-duration:200ms;-moz-animation-duration:200ms}.slidedown.out{-webkit-animation-name:fadeout;-moz-animation-name:fadeout;-webkit-animation-duration:100ms;-moz-animation-duration:100ms}.slidedown.in{-webkit-transform:translateY(0);-webkit-animation-name:slideinfromtop;-moz-transform:translateY(0);-moz-animation-name:slideinfromtop;-webkit-animation-duration:250ms;-moz-animation-duration:250ms}.slidedown.in.reverse{-webkit-animation-name:fadein;-moz-animation-name:fadein;-webkit-animation-duration:150ms;-moz-animation-duration:150ms}.slidedown.out.reverse{-webkit-transform:translateY(-100%);-moz-transform:translateY(-100%);-webkit-animation-name:slideouttotop;-moz-animation-name:slideouttotop;-webkit-animation-duration:200ms;-moz-animation-duration:200ms}@-webkit-keyframes slideinfromtop{from{-webkit-transform:translateY(-100%)}to{-webkit-transform:translateY(0)}}@-moz-keyframes slideinfromtop{from{-moz-transform:translateY(-100%)}to{-moz-transform:translateY(0)}}@-webkit-keyframes slideouttotop{from{-webkit-transform:translateY(0)}to{-webkit-transform:translateY(-100%)}}@-moz-keyframes slideouttotop{from{-moz-transform:translateY(0)}to{-moz-transform:translateY(-100%)}}.slideup.out{-webkit-animation-name:fadeout;-moz-animation-name:fadeout;-webkit-animation-duration:100ms;-moz-animation-duration:100ms}.slideup.in{-webkit-transform:translateY(0);-webkit-animation-name:slideinfrombottom;-moz-transform:translateY(0);-moz-animation-name:slideinfrombottom;-webkit-animation-duration:250ms;-moz-animation-duration:250ms}.slideup.in.reverse{-webkit-animation-name:fadein;-moz-animation-name:fadein;-webkit-animation-duration:150ms;-moz-animation-duration:150ms}.slideup.out.reverse{-webkit-transform:translateY(100%);-moz-transform:translateY(100%);-webkit-animation-name:slideouttobottom;-moz-animation-name:slideouttobottom;-webkit-animation-duration:200ms;-moz-animation-duration:200ms}@-webkit-keyframes slideinfrombottom{from{-webkit-transform:translateY(100%)}to{-webkit-transform:translateY(0)}}@-moz-keyframes slideinfrombottom{from{-moz-transform:translateY(100%)}to{-moz-transform:translateY(0)}}@-webkit-keyframes slideouttobottom{from{-webkit-transform:translateY(0)}to{-webkit-transform:translateY(100%)}}@-moz-keyframes slideouttobottom{from{-moz-transform:translateY(0)}to{-moz-transform:translateY(100%)}}.viewport-flip{-webkit-perspective:1000;-moz-perspective:1000;position:absolute}.flip{-webkit-backface-visibility:hidden;-webkit-transform:translateX(0);-moz-backface-visibility:hidden;-moz-transform:translateX(0)}.flip.out{-webkit-transform:rotateY(-90deg) scale(.9);-webkit-animation-name:flipouttoleft;-webkit-animation-duration:175ms;-moz-transform:rotateY(-90deg) scale(.9);-moz-animation-name:flipouttoleft;-moz-animation-duration:175ms}.flip.in{-webkit-animation-name:flipintoright;-webkit-animation-duration:225ms;-moz-animation-name:flipintoright;-moz-animation-duration:225ms}.flip.out.reverse{-webkit-transform:rotateY(90deg) scale(.9);-webkit-animation-name:flipouttoright;-moz-transform:rotateY(90deg) scale(.9);-moz-animation-name:flipouttoright}.flip.in.reverse{-webkit-animation-name:flipintoleft;-moz-animation-name:flipintoleft}@-webkit-keyframes flipouttoleft{from{-webkit-transform:rotateY(0)}to{-webkit-transform:rotateY(-90deg) scale(.9)}}@-moz-keyframes flipouttoleft{from{-moz-transform:rotateY(0)}to{-moz-transform:rotateY(-90deg) scale(.9)}}@-webkit-keyframes flipouttoright{from{-webkit-transform:rotateY(0)}to{-webkit-transform:rotateY(90deg) scale(.9)}}@-moz-keyframes flipouttoright{from{-moz-transform:rotateY(0)}to{-moz-transform:rotateY(90deg) scale(.9)}}@-webkit-keyframes flipintoleft{from{-webkit-transform:rotateY(-90deg) scale(.9)}to{-webkit-transform:rotateY(0)}}@-moz-keyframes flipintoleft{from{-moz-transform:rotateY(-90deg) scale(.9)}to{-moz-transform:rotateY(0)}}@-webkit-keyframes flipintoright{from{-webkit-transform:rotateY(90deg) scale(.9)}to{-webkit-transform:rotateY(0)}}@-moz-keyframes flipintoright{from{-moz-transform:rotateY(90deg) scale(.9)}to{-moz-transform:rotateY(0)}}.viewport-turn{-webkit-perspective:1000;-moz-perspective:1000;position:absolute}.turn{-webkit-backface-visibility:hidden;-webkit-transform:translateX(0);-webkit-transform-origin:0;-moz-backface-visibility:hidden;-moz-transform:translateX(0);-moz-transform-origin:0}.turn.out{-webkit-transform:rotateY(-90deg) scale(.9);-webkit-animation-name:flipouttoleft;-moz-transform:rotateY(-90deg) scale(.9);-moz-animation-name:flipouttoleft;-webkit-animation-duration:125ms;-moz-animation-duration:125ms}.turn.in{-webkit-animation-name:flipintoright;-moz-animation-name:flipintoright;-webkit-animation-duration:250ms;-moz-animation-duration:250ms}.turn.out.reverse{-webkit-transform:rotateY(90deg) scale(.9);-webkit-animation-name:flipouttoright;-moz-transform:rotateY(90deg) scale(.9);-moz-animation-name:flipouttoright}.turn.in.reverse{-webkit-animation-name:flipintoleft;-moz-animation-name:flipintoleft}@-webkit-keyframes flipouttoleft{from{-webkit-transform:rotateY(0)}to{-webkit-transform:rotateY(-90deg) scale(.9)}}@-moz-keyframes flipouttoleft{from{-moz-transform:rotateY(0)}to{-moz-transform:rotateY(-90deg) scale(.9)}}@-webkit-keyframes flipouttoright{from{-webkit-transform:rotateY(0)}to{-webkit-transform:rotateY(90deg) scale(.9)}}@-moz-keyframes flipouttoright{from{-moz-transform:rotateY(0)}to{-moz-transform:rotateY(90deg) scale(.9)}}@-webkit-keyframes flipintoleft{from{-webkit-transform:rotateY(-90deg) scale(.9)}to{-webkit-transform:rotateY(0)}}@-moz-keyframes flipintoleft{from{-moz-transform:rotateY(-90deg) scale(.9)}to{-moz-transform:rotateY(0)}}@-webkit-keyframes flipintoright{from{-webkit-transform:rotateY(90deg) scale(.9)}to{-webkit-transform:rotateY(0)}}@-moz-keyframes flipintoright{from{-moz-transform:rotateY(90deg) scale(.9)}to{-moz-transform:rotateY(0)}}.flow{-webkit-transform-origin:50% 30%;-moz-transform-origin:50% 30%;-webkit-box-shadow:0 0 20px rgba(0,0,0,.4);-moz-box-shadow:0 0 20px rgba(0,0,0,.4)}.ui-dialog.flow{-webkit-transform-origin:none;-moz-transform-origin:none;-webkit-box-shadow:none;-moz-box-shadow:none}.flow.out{-webkit-transform:translateX(-100%) scale(.7);-webkit-animation-name:flowouttoleft;-webkit-animation-timing-function:ease;-webkit-animation-duration:350ms;-moz-transform:translateX(-100%) scale(.7);-moz-animation-name:flowouttoleft;-moz-animation-timing-function:ease;-moz-animation-duration:350ms}.flow.in{-webkit-transform:translateX(0) scale(1);-webkit-animation-name:flowinfromright;-webkit-animation-timing-function:ease;-webkit-animation-duration:350ms;-moz-transform:translateX(0) scale(1);-moz-animation-name:flowinfromright;-moz-animation-timing-function:ease;-moz-animation-duration:350ms}.flow.out.reverse{-webkit-transform:translateX(100%);-webkit-animation-name:flowouttoright;-moz-transform:translateX(100%);-moz-animation-name:flowouttoright}.flow.in.reverse{-webkit-animation-name:flowinfromleft;-moz-animation-name:flowinfromleft}@-webkit-keyframes flowouttoleft{0%{-webkit-transform:translateX(0) scale(1)}60%,70%{-webkit-transform:translateX(0) scale(.7)}100%{-webkit-transform:translateX(-100%) scale(.7)}}@-moz-keyframes flowouttoleft{0%{-moz-transform:translateX(0) scale(1)}60%,70%{-moz-transform:translateX(0) scale(.7)}100%{-moz-transform:translateX(-100%) scale(.7)}}@-webkit-keyframes flowouttoright{0%{-webkit-transform:translateX(0) scale(1)}60%,70%{-webkit-transform:translateX(0) scale(.7)}100%{-webkit-transform:translateX(100%) scale(.7)}}@-moz-keyframes flowouttoright{0%{-moz-transform:translateX(0) scale(1)}60%,70%{-moz-transform:translateX(0) scale(.7)}100%{-moz-transform:translateX(100%) scale(.7)}}@-webkit-keyframes flowinfromleft{0%{-webkit-transform:translateX(-100%) scale(.7)}30%,40%{-webkit-transform:translateX(0) scale(.7)}100%{-webkit-transform:translateX(0) scale(1)}}@-moz-keyframes flowinfromleft{0%{-moz-transform:translateX(-100%) scale(.7)}30%,40%{-moz-transform:translateX(0) scale(.7)}100%{-moz-transform:translateX(0) scale(1)}}@-webkit-keyframes flowinfromright{0%{-webkit-transform:translateX(100%) scale(.7)}30%,40%{-webkit-transform:translateX(0) scale(.7)}100%{-webkit-transform:translateX(0) scale(1)}}@-moz-keyframes flowinfromright{0%{-moz-transform:translateX(100%) scale(.7)}30%,40%{-moz-transform:translateX(0) scale(.7)}100%{-moz-transform:translateX(0) scale(1)}}.ui-grid-a,.ui-grid-b,.ui-grid-c,.ui-grid-d{overflow:hidden}.ui-block-a,.ui-block-b,.ui-block-c,.ui-block-d,.ui-block-e{margin:0;padding:0;border:0;float:left;min-height:1px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.ui-grid-solo .ui-block-a{display:block;float:none}.ui-grid-a .ui-block-a,.ui-grid-a .ui-block-b{width:49.95%}.ui-grid-a >:nth-child(n){width:50%;margin-right:-.5px}.ui-grid-a .ui-block-a{clear:left}.ui-grid-b .ui-block-a,.ui-grid-b .ui-block-b,.ui-grid-b .ui-block-c{width:33.25%}.ui-grid-b >:nth-child(n){width:33.333%;margin-right:-.5px}.ui-grid-b .ui-block-a{clear:left}.ui-grid-c .ui-block-a,.ui-grid-c .ui-block-b,.ui-grid-c .ui-block-c,.ui-grid-c .ui-block-d{width:24.925%}.ui-grid-c >:nth-child(n){width:25%;margin-right:-.5px}.ui-grid-c .ui-block-a{clear:left}.ui-grid-d .ui-block-a,.ui-grid-d .ui-block-b,.ui-grid-d .ui-block-c,.ui-grid-d .ui-block-d,.ui-grid-d .ui-block-e{width:19.925%}.ui-grid-d >:nth-child(n){width:20%}.ui-grid-d .ui-block-a{clear:left}.ui-header-fixed,.ui-footer-fixed{left:0;right:0;width:100%;position:fixed;z-index:1000}.ui-header-fixed{top:0}.ui-footer-fixed{bottom:0}.ui-header-fullscreen,.ui-footer-fullscreen{filter:Alpha(Opacity=90);opacity:.9}.ui-page-header-fixed{padding-top:2.6875em}.ui-page-footer-fixed{padding-bottom:2.6875em}.ui-page-header-fullscreen .ui-content,.ui-page-footer-fullscreen .ui-content{padding:0}.ui-fixed-hidden{position:absolute}.ui-page-header-fullscreen .ui-fixed-hidden,.ui-page-footer-fullscreen .ui-fixed-hidden{left:-9999px}.ui-header-fixed .ui-btn,.ui-footer-fixed .ui-btn{z-index:10}.ui-navbar{max-width:100%}.ui-navbar.ui-mini{margin:0}.ui-navbar ul:before,.ui-navbar ul:after{content:" ";display:table}.ui-navbar ul:after{clear:both}.ui-navbar ul{list-style:none;margin:0;padding:0;position:relative;display:block;border:0;max-width:100%;overflow:visible;zoom:1}.ui-navbar li .ui-btn{display:block;text-align:center;margin:0 -1px 0 0;border-right-width:0}.ui-navbar li .ui-btn-icon-right .ui-icon{right:6px}.ui-navbar li:last-child .ui-btn,.ui-navbar .ui-grid-duo .ui-block-b .ui-btn{margin-right:0;border-right-width:1px}.ui-header .ui-navbar li:last-child .ui-btn,.ui-footer .ui-navbar li:last-child .ui-btn,.ui-header .ui-navbar .ui-grid-duo .ui-block-b .ui-btn,.ui-footer .ui-navbar .ui-grid-duo .ui-block-b .ui-btn{margin-right:-1px;border-right-width:0}.ui-navbar .ui-grid-duo li.ui-block-a:last-child .ui-btn{margin-right:-1px;border-right-width:1px}.ui-header .ui-navbar li .ui-btn,.ui-footer .ui-navbar li .ui-btn{border-top-width:0;border-bottom-width:0}.ui-header .ui-navbar .ui-grid-b li.ui-block-c .ui-btn,.ui-footer .ui-navbar .ui-grid-b li.ui-block-c .ui-btn{margin-right:-5px}.ui-header .ui-navbar .ui-grid-c li.ui-block-d .ui-btn,.ui-footer .ui-navbar .ui-grid-c li.ui-block-d .ui-btn,.ui-header .ui-navbar .ui-grid-d li.ui-block-e .ui-btn,.ui-footer .ui-navbar .ui-grid-d li.ui-block-e .ui-btn{margin-right:-4px}.ui-header .ui-navbar .ui-grid-b li.ui-block-c .ui-btn-icon-right .ui-icon,.ui-footer .ui-navbar .ui-grid-b li.ui-block-c .ui-btn-icon-right .ui-icon,.ui-header .ui-navbar .ui-grid-c li.ui-block-d .ui-btn-icon-right .ui-icon,.ui-footer .ui-navbar .ui-grid-c li.ui-block-d .ui-btn-icon-right .ui-icon,.ui-header .ui-navbar .ui-grid-d li.ui-block-e .ui-btn-icon-right .ui-icon,.ui-footer .ui-navbar .ui-grid-d li.ui-block-e .ui-btn-icon-right .ui-icon{right:8px}.ui-navbar li .ui-btn .ui-btn-inner{padding-top:.7em;padding-bottom:.8em}.ui-navbar li .ui-btn-icon-top .ui-btn-inner{padding-top:30px}.ui-navbar li .ui-btn-icon-bottom .ui-btn-inner{padding-bottom:30px}.ui-btn{display:block;text-align:center;cursor:pointer;position:relative;margin:.5em 0;padding:0}.ui-mini{margin-top:.25em;margin-bottom:.25em}.ui-btn-left,.ui-btn-right,.ui-input-clear,.ui-btn-inline,.ui-grid-a .ui-btn,.ui-grid-b .ui-btn,.ui-grid-c .ui-btn,.ui-grid-d .ui-btn,.ui-grid-e .ui-btn,.ui-grid-solo .ui-btn{margin-right:5px;margin-left:5px}.ui-btn-inner{font-size:16px;padding:.6em 20px;min-width:.75em;display:block;position:relative;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;zoom:1}.ui-btn input,.ui-btn button{z-index:2}.ui-btn-left,.ui-btn-right,.ui-btn-inline{display:inline-block;vertical-align:middle}.ui-mobile .ui-btn-left,.ui-mobile .ui-btn-right{margin:0}.ui-btn-block{display:block}.ui-header > .ui-btn,.ui-footer > .ui-btn{display:inline-block;margin:0}.ui-header .ui-btn-block,.ui-footer .ui-btn-block{display:block}.ui-header .ui-btn-inner,.ui-footer .ui-btn-inner,.ui-mini .ui-btn-inner{font-size:12.5px;padding:.55em 11px .5em}.ui-fullsize .ui-btn-inner,.ui-fullsize .ui-btn-inner{font-size:16px;padding:.6em 20px}.ui-btn-icon-notext{width:24px;height:24px}.ui-btn-icon-notext .ui-btn-inner{padding:0;height:100%}.ui-btn-icon-notext .ui-btn-inner .ui-icon{margin:2px 1px 2px 3px;float:left}.ui-btn-text{position:relative;z-index:1;width:100%;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}.ui-btn-icon-notext .ui-btn-text{position:absolute;left:-9999px}.ui-btn-icon-left .ui-btn-inner{padding-left:40px}.ui-btn-icon-right .ui-btn-inner{padding-right:40px}.ui-btn-icon-top .ui-btn-inner{padding-top:40px}.ui-btn-icon-bottom .ui-btn-inner{padding-bottom:40px}.ui-header .ui-btn-icon-left .ui-btn-inner,.ui-footer .ui-btn-icon-left .ui-btn-inner,.ui-mini.ui-btn-icon-left .ui-btn-inner,.ui-mini .ui-btn-icon-left .ui-btn-inner{padding-left:30px}.ui-header .ui-btn-icon-right .ui-btn-inner,.ui-footer .ui-btn-icon-right .ui-btn-inner,.ui-mini.ui-btn-icon-right .ui-btn-inner,.ui-mini .ui-btn-icon-right .ui-btn-inner{padding-right:30px}.ui-header .ui-btn-icon-top .ui-btn-inner,.ui-footer .ui-btn-icon-top .ui-btn-inner{padding:30px 3px .5em 3px}.ui-mini.ui-btn-icon-top .ui-btn-inner,.ui-mini .ui-btn-icon-top .ui-btn-inner{padding-top:30px}.ui-header .ui-btn-icon-bottom .ui-btn-inner,.ui-footer .ui-btn-icon-bottom .ui-btn-inner{padding:.55em 3px 30px 3px}.ui-mini.ui-btn-icon-bottom .ui-btn-inner,.ui-mini .ui-btn-icon-bottom .ui-btn-inner{padding-bottom:30px}.ui-btn-icon-notext .ui-icon{display:block;z-index:0}.ui-btn-icon-left > .ui-btn-inner > .ui-icon,.ui-btn-icon-right > .ui-btn-inner > .ui-icon{position:absolute;top:50%;margin-top:-9px}.ui-btn-icon-top .ui-btn-inner .ui-icon,.ui-btn-icon-bottom .ui-btn-inner .ui-icon{position:absolute;left:50%;margin-left:-9px}.ui-btn-icon-left .ui-icon{left:10px}.ui-btn-icon-right .ui-icon{right:10px}.ui-btn-icon-top .ui-icon{top:10px}.ui-btn-icon-bottom .ui-icon{top:auto;bottom:10px}.ui-header .ui-btn-icon-left .ui-icon,.ui-footer .ui-btn-icon-left .ui-icon,.ui-mini.ui-btn-icon-left .ui-icon,.ui-mini .ui-btn-icon-left .ui-icon{left:5px}.ui-header .ui-btn-icon-right .ui-icon,.ui-footer .ui-btn-icon-right .ui-icon,.ui-mini.ui-btn-icon-right .ui-icon,.ui-mini .ui-btn-icon-right .ui-icon{right:5px}.ui-header .ui-btn-icon-top .ui-icon,.ui-footer .ui-btn-icon-top .ui-icon,.ui-mini.ui-btn-icon-top .ui-icon,.ui-mini .ui-btn-icon-top .ui-icon{top:5px}.ui-header .ui-btn-icon-bottom .ui-icon,.ui-footer .ui-btn-icon-bottom .ui-icon,.ui-mini.ui-btn-icon-bottom .ui-icon,.ui-mini .ui-btn-icon-bottom .ui-icon{bottom:5px}.ui-btn-hidden{position:absolute;top:0;left:0;width:100%;height:100%;-webkit-appearance:none;cursor:pointer;background:#fff;background:rgba(255,255,255,0);filter:Alpha(Opacity=0);opacity:.1;font-size:1px;border:none;text-indent:-9999px}.ui-disabled .ui-btn-hidden{display:none}.ui-disabled{z-index:1}.ui-field-contain .ui-btn.ui-submit{margin:0}label.ui-submit{font-size:16px;line-height:1.4;font-weight:normal;margin:0 0 .3em;display:block}@media all and (min-width:450px){.ui-field-contain label.ui-submit{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-field-contain .ui-btn.ui-submit{width:78%;display:inline-block;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.ui-hide-label .ui-btn.ui-submit{width:auto;display:block}}.ui-collapsible-inset{margin:.5em 0}.ui-collapsible-heading{font-size:16px;display:block;margin:0 -15px;padding:0;position:relative}.ui-collapsible-inset .ui-collapsible-heading{margin:0}.ui-collapsible-heading .ui-btn{text-align:left;margin:0;border-left-width:0;border-right-width:0}.ui-collapsible-inset .ui-collapsible-heading .ui-btn{border-right-width:1px;border-left-width:1px}.ui-collapsible-collapsed + .ui-collapsible:not(.ui-collapsible-inset) .ui-collapsible-heading .ui-btn{border-top-width:0}.ui-collapsible-set .ui-collapsible:not(.ui-collapsible-inset) .ui-collapsible-heading .ui-btn{border-top-width:1px}.ui-collapsible-heading .ui-btn-inner,.ui-collapsible-heading .ui-btn-icon-left .ui-btn-inner{padding-left:40px}.ui-collapsible-heading .ui-btn-icon-right .ui-btn-inner{padding-left:12px;padding-right:40px}.ui-collapsible-heading .ui-btn-icon-top .ui-btn-inner,.ui-collapsible-heading .ui-btn-icon-bottom .ui-btn-inner{padding-right:40px;text-align:center}.ui-collapsible-heading .ui-btn span.ui-btn{position:absolute;left:6px;top:50%;margin:-12px 0 0 0;width:20px;height:20px;padding:1px 0 1px 2px;text-indent:-9999px}.ui-collapsible-heading .ui-btn span.ui-btn .ui-btn-inner{padding:10px 0}.ui-collapsible-heading .ui-btn span.ui-btn .ui-icon{left:0;margin-top:-10px}.ui-collapsible-heading-status{position:absolute;top:-9999px;left:0}.ui-collapsible-content{display:block;margin:0 -15px;padding:10px 15px;border-left-width:0;border-right-width:0;border-top:none;background-image:none}.ui-collapsible-inset .ui-collapsible-content{margin:0;border-right-width:1px;border-left-width:1px}.ui-collapsible-content-collapsed{display:none}.ui-collapsible-set{margin:.5em 0}.ui-collapsible-set .ui-collapsible{margin:-1px 0 0}.ui-collapsible-set .ui-collapsible:first-child{margin-top:0}.ui-controlgroup,fieldset.ui-controlgroup{padding:0;margin:.5em 0;zoom:1}.ui-controlgroup.ui-mini,fieldset.ui-controlgroup.ui-mini{margin:.25em 0}.ui-field-contain .ui-controlgroup,.ui-field-contain fieldset.ui-controlgroup{margin:0}.ui-bar .ui-controlgroup{margin:0 5px}.ui-controlgroup-label{font-size:16px;line-height:1.4;font-weight:normal;margin:0 0 .4em}.ui-controlgroup li{list-style:none}.ui-controlgroup-vertical .ui-btn,.ui-controlgroup-vertical .ui-checkbox,.ui-controlgroup-vertical .ui-radio{margin:0;border-bottom-width:0}.ui-controlgroup-vertical .ui-controlgroup-last{border-bottom-width:1px}.ui-controlgroup-controls label.ui-select{position:absolute;left:-9999px}.ui-controlgroup .ui-btn-icon-notext{width:auto;height:auto;top:auto}.ui-controlgroup .ui-btn-icon-notext .ui-btn-inner{height:20px;padding:.6em 20px .6em 20px}.ui-controlgroup-horizontal .ui-btn-icon-notext .ui-btn-inner{width:18px}.ui-controlgroup.ui-mini .ui-btn-icon-notext .ui-btn-inner,.ui-header .ui-controlgroup .ui-btn-icon-notext .ui-btn-inner,.ui-footer .ui-controlgroup .ui-btn-icon-notext .ui-btn-inner{height:16px;padding:.55em 11px .5em 11px}.ui-controlgroup .ui-btn-icon-notext .ui-btn-inner .ui-icon{position:absolute;top:50%;right:50%;margin:-9px -9px 0 0}.ui-controlgroup-horizontal .ui-controlgroup-controls:before,.ui-controlgroup-horizontal .ui-controlgroup-controls:after{content:"";display:table}.ui-controlgroup-horizontal .ui-controlgroup-controls:after{clear:both}.ui-controlgroup-horizontal .ui-controlgroup-controls{display:inline-block;vertical-align:middle;zoom:1}.ui-controlgroup-horizontal .ui-btn-inner{text-align:center}.ui-controlgroup-horizontal.ui-mini .ui-btn-inner{height:16px;line-height:16px}.ui-controlgroup-horizontal .ui-btn,.ui-controlgroup-horizontal .ui-select,.ui-controlgroup-horizontal .ui-checkbox,.ui-controlgroup-horizontal .ui-radio{float:left;clear:none;margin:0 -1px 0 0}.ui-controlgroup-horizontal .ui-select .ui-btn,.ui-controlgroup-horizontal .ui-checkbox .ui-btn,.ui-controlgroup-horizontal .ui-radio .ui-btn{float:none;margin:0}.ui-controlgroup-horizontal .ui-controlgroup-last,.ui-controlgroup-horizontal .ui-select:last-child,.ui-controlgroup-horizontal .ui-checkbox:last-child,.ui-controlgroup-horizontal .ui-radio:last-child{margin-right:0}.ui-controlgroup .ui-checkbox label,.ui-controlgroup .ui-radio label{font-size:16px}@media all and (min-width:450px){.ui-field-contain .ui-controlgroup-label{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-field-contain .ui-controlgroup-controls{width:78%;display:inline-block}.ui-field-contain .ui-controlgroup .ui-select{width:100%;display:block}.ui-field-contain .ui-controlgroup-horizontal .ui-select{width:auto}.ui-hide-label .ui-controlgroup-controls{width:100%}}.ui-dialog{background:none!important}.ui-dialog-contain{width:92.5%;max-width:500px;margin:10% auto 15px auto;padding:0;position:relative;top:-15px}.ui-dialog-contain > .ui-header,.ui-dialog-contain > .ui-content,.ui-dialog-contain > .ui-footer{display:block;position:relative;width:auto;margin:0}.ui-dialog-contain > .ui-header{border:none;overflow:hidden;z-index:10;padding:0}.ui-dialog-contain > .ui-content{padding:15px}.ui-dialog-contain > .ui-footer{z-index:10;padding:0 15px}.ui-popup-open .ui-header-fixed,.ui-popup-open .ui-footer-fixed{position:absolute!important}.ui-popup-screen{background-image:url(data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==);top:0;left:0;right:0;bottom:1px;position:absolute;filter:Alpha(Opacity=0);opacity:0;z-index:1099}.ui-popup-screen.in{opacity:0.5;filter:Alpha(Opacity=50)}.ui-popup-screen.out{opacity:0;filter:Alpha(Opacity=0)}.ui-popup-container{z-index:1100;display:inline-block;position:absolute;padding:0;outline:0}.ui-popup{position:relative}.ui-popup.ui-content,.ui-popup .ui-content{overflow:visible}.ui-popup > p,.ui-popup > h1,.ui-popup > h2,.ui-popup > h3,.ui-popup > h4,.ui-popup > h5,.ui-popup > h6{margin:.5em 7px}.ui-popup > span{display:block;margin:.5em 7px}.ui-popup .ui-title{font-size:16px;font-weight:bold;margin-top:.5em;margin-bottom:.5em}.ui-popup-container .ui-content > p,.ui-popup-container .ui-content > h1,.ui-popup-container .ui-content > h2,.ui-popup-container .ui-content > h3,.ui-popup-container .ui-content > h4,.ui-popup-container .ui-content > h5,.ui-popup-container .ui-content > h6{margin:.5em 0}.ui-popup-container .ui-content > span{margin:0}.ui-popup-container .ui-content > p:first-child,.ui-popup-container .ui-content > h1:first-child,.ui-popup-container .ui-content > h2:first-child,.ui-popup-container .ui-content > h3:first-child,.ui-popup-container .ui-content > h4:first-child,.ui-popup-container .ui-content > h5:first-child,.ui-popup-container .ui-content > h6:first-child{margin-top:0}.ui-popup-container .ui-content > p:last-child,.ui-popup-container .ui-content > h1:last-child,.ui-popup-container .ui-content > h2:last-child,.ui-popup-container .ui-content > h3:last-child,.ui-popup-container .ui-content > h4:last-child,.ui-popup-container .ui-content > h5:last-child,.ui-popup-container .ui-content > h6:last-child{margin-bottom:0}.ui-popup > img{width:auto;height:auto;max-width:100%;max-height:100%;vertical-align:middle}.ui-popup iframe{vertical-align:middle}@media all and (min-width:450px){.ui-popup .ui-field-contain label.ui-submit,.ui-popup .ui-field-contain .ui-controlgroup-label,.ui-popup .ui-field-contain label.ui-select,.ui-popup .ui-field-contain label.ui-input-text{font-size:16px;line-height:1.4;display:block;font-weight:normal;margin:0 0 .3em}.ui-popup .ui-field-contain .ui-btn.ui-submit,.ui-popup .ui-field-contain .ui-controlgroup-controls,.ui-popup .ui-field-contain .ui-select,.ui-popup .ui-field-contain input.ui-input-text,.ui-popup .ui-field-contain textarea.ui-input-text,.ui-popup .ui-field-contain .ui-input-search{width:100%;display:block}}.ui-popup > .ui-btn-left,.ui-popup > .ui-btn-right{position:absolute;top:-9px;margin:0;z-index:1101}.ui-popup > .ui-btn-left{left:-9px}.ui-popup > .ui-btn-right{right:-9px}.ui-popup.ui-corner-all > .ui-header,.ui-popup.ui-corner-all ~ .ui-content,.ui-popup.ui-corner-all > .ui-content:first-child{-webkit-border-top-left-radius:inherit;border-top-left-radius:inherit;-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit}.ui-popup.ui-corner-all > .ui-content,.ui-popup.ui-corner-all > .ui-footer,.ui-popup.ui-corner-all > .ui-header:nth-child(n):last-child{-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:inherit;border-bottom-right-radius:inherit}.ui-popup.ui-corner-all > .ui-content:nth-child(2),.ui-popup.ui-corner-all > .ui-header:nth-child(2){-webkit-border-top-left-radius:0;border-top-left-radius:0;-webkit-border-top-right-radius:0;border-top-right-radius:0}.ui-popup.ui-corner-all > .ui-content:nth-last-child(1n+2),.ui-popup.ui-corner-all > .ui-footer:nth-last-child(1n+2){-webkit-border-bottom-left-radius:0;border-bottom-left-radius:0;-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0}.ui-popup.ui-corner-all > .ui-header:only-child,.ui-popup.ui-corner-all > .ui-footer:only-child{-webkit-border-radius:inherit;border-radius:inherit}.ui-checkbox,.ui-radio{position:relative;clear:both;margin:0;z-index:1}.ui-checkbox .ui-btn,.ui-radio .ui-btn{margin-top:.5em;margin-bottom:.5em;text-align:left;z-index:2}.ui-checkbox .ui-btn.ui-mini,.ui-radio .ui-btn.ui-mini{margin:.25em 0}.ui-controlgroup .ui-checkbox .ui-btn,.ui-controlgroup .ui-radio .ui-btn{margin:0}.ui-checkbox .ui-btn-inner,.ui-radio .ui-btn-inner{white-space:normal}.ui-checkbox .ui-btn-icon-left .ui-btn-inner,.ui-radio .ui-btn-icon-left .ui-btn-inner{padding-left:45px}.ui-checkbox .ui-mini.ui-btn-icon-left .ui-btn-inner,.ui-radio .ui-mini.ui-btn-icon-left .ui-btn-inner{padding-left:36px}.ui-checkbox .ui-btn-icon-right .ui-btn-inner,.ui-radio .ui-btn-icon-right .ui-btn-inner{padding-right:45px}.ui-checkbox .ui-mini.ui-btn-icon-right .ui-btn-inner,.ui-radio .ui-mini.ui-btn-icon-right .ui-btn-inner{padding-right:36px}.ui-checkbox .ui-btn-icon-top .ui-btn-inner,.ui-radio .ui-btn-icon-top .ui-btn-inner{padding-right:0;padding-left:0;text-align:center}.ui-checkbox .ui-btn-icon-bottom .ui-btn-inner,.ui-radio .ui-btn-icon-bottom .ui-btn-inner{padding-right:0;padding-left:0;text-align:center}.ui-checkbox .ui-icon,.ui-radio .ui-icon{top:1.1em}.ui-checkbox .ui-btn-icon-left .ui-icon,.ui-radio .ui-btn-icon-left .ui-icon{left:15px}.ui-checkbox .ui-mini.ui-btn-icon-left .ui-icon,.ui-radio .ui-mini.ui-btn-icon-left .ui-icon{left:9px}.ui-checkbox .ui-btn-icon-right .ui-icon,.ui-radio .ui-btn-icon-right .ui-icon{right:15px}.ui-checkbox .ui-mini.ui-btn-icon-right .ui-icon,.ui-radio .ui-mini.ui-btn-icon-right .ui-icon{right:9px}.ui-checkbox .ui-btn-icon-top .ui-icon,.ui-radio .ui-btn-icon-top .ui-icon{top:10px}.ui-checkbox .ui-btn-icon-bottom .ui-icon,.ui-radio .ui-btn-icon-bottom .ui-icon{top:auto;bottom:10px}.ui-checkbox .ui-btn-icon-right .ui-icon,.ui-radio .ui-btn-icon-right .ui-icon{right:15px}.ui-checkbox .ui-mini.ui-btn-icon-right .ui-icon,.ui-radio .ui-mini.ui-btn-icon-right .ui-icon{right:9px}.ui-checkbox input,.ui-radio input{position:absolute;left:20px;top:50%;width:10px;height:10px;margin:-5px 0 0 0;outline:0!important;z-index:1}.ui-field-contain,fieldset.ui-field-contain{padding:.8em 0;margin:0;border-width:0 0 1px 0;overflow:visible}.ui-field-contain:last-child{border-bottom-width:0}.ui-field-contain{max-width:100%}@media all and (min-width:450px){.ui-field-contain,.ui-mobile fieldset.ui-field-contain{border-width:0;padding:0;margin:1em 0}}.ui-select{display:block;position:relative}.ui-select select{position:absolute;left:-9999px;top:-9999px}.ui-select .ui-btn{overflow:hidden;opacity:1}.ui-field-contain .ui-select .ui-btn{margin:0}.ui-select .ui-btn select{cursor:pointer;-webkit-appearance:none;left:0;top:0;width:100%;min-height:1.5em;min-height:100%;height:3em;max-height:100%;filter:Alpha(Opacity=0);opacity:0;z-index:2}.ui-select .ui-disabled{opacity:.3}.ui-select .ui-disabled select{display:none}@-moz-document url-prefix(){.ui-select .ui-btn select{opacity:0.0001}}.ui-select .ui-btn.ui-select-nativeonly{border-radius:0;border:0}.ui-select .ui-btn.ui-select-nativeonly select{opacity:1;text-indent:0;display:block}.ui-select .ui-disabled.ui-select-nativeonly .ui-btn-inner{opacity:0}.ui-select .ui-btn-icon-right .ui-btn-inner,.ui-select .ui-li-has-count .ui-btn-inner{padding-right:45px}.ui-select .ui-mini.ui-btn-icon-right .ui-btn-inner{padding-right:32px}.ui-select .ui-btn-icon-right.ui-li-has-count .ui-btn-inner{padding-right:80px}.ui-select .ui-mini.ui-btn-icon-right.ui-li-has-count .ui-btn-inner{padding-right:67px}.ui-select .ui-btn-icon-right .ui-icon{right:15px}.ui-select .ui-mini.ui-btn-icon-right .ui-icon{right:7px}.ui-select .ui-btn-icon-right.ui-li-has-count .ui-li-count{right:45px}.ui-select .ui-mini.ui-btn-icon-right.ui-li-has-count .ui-li-count{right:32px}label.ui-select{font-size:16px;line-height:1.4;font-weight:normal;margin:0 0 .3em;display:block}.ui-select .ui-btn-text,.ui-selectmenu .ui-btn-text{display:block;min-height:1em;overflow:hidden!important}.ui-select .ui-btn-text{text-overflow:ellipsis}.ui-selectmenu{padding:6px;min-width:160px}.ui-selectmenu .ui-listview{margin:0}.ui-selectmenu .ui-btn.ui-li-divider{cursor:default}.ui-selectmenu-hidden{top:-99999px;left:-9999px}.ui-screen-hidden,.ui-selectmenu-list .ui-li .ui-icon{display:none}.ui-selectmenu-list .ui-li .ui-icon{display:block}.ui-li.ui-selectmenu-placeholder{display:none}.ui-selectmenu .ui-header{margin:0;padding:0}.ui-selectmenu .ui-header .ui-title{margin:0.6em 46px 0.8em}@media all and (min-width:450px){.ui-field-contain label.ui-select{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-field-contain .ui-select{width:78%;display:inline-block}.ui-hide-label .ui-select{width:100%}}.ui-selectmenu .ui-header h1:after{content:'.';visibility:hidden}label.ui-input-text{font-size:16px;line-height:1.4;display:block;font-weight:normal;margin:0 0 .3em}input.ui-input-text,textarea.ui-input-text{background-image:none;padding:.4em;margin:.5em 0;line-height:1.4;font-size:16px;display:block;width:100%;outline:0}input.ui-input-text.ui-mini,textarea.ui-input-text.ui-mini{margin:.25em 0}.ui-field-contain input.ui-input-text,.ui-field-contain textarea.ui-input-text{margin:0}input.ui-input-text,textarea.ui-input-text,.ui-input-search{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}input.ui-input-text{-webkit-appearance:none}textarea.ui-input-text{height:50px;-webkit-transition:height 200ms linear;-moz-transition:height 200ms linear;-o-transition:height 200ms linear;transition:height 200ms linear}.ui-input-search{padding:0 30px;margin:.5em 0;background-image:none;position:relative}.ui-input-search.ui-mini{margin:.25em 0}.ui-field-contain .ui-input-search{margin:0}.ui-icon-searchfield:after{position:absolute;left:7px;top:50%;margin-top:-9px;content:"";width:18px;height:18px;opacity:.5}.ui-input-search input.ui-input-text{border:none;width:98%;padding:.4em 0;margin:0;display:block;background:transparent none;outline:0!important}.ui-input-search .ui-input-clear{position:absolute;right:0;top:50%;margin-top:-13px}.ui-mini .ui-input-clear{right:-3px}.ui-input-search .ui-input-clear-hidden{display:none}input.ui-mini,.ui-mini input,textarea.ui-mini{font-size:14px}textarea.ui-mini{height:45px}@media all and (min-width:450px){.ui-field-contain label.ui-input-text{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-field-contain input.ui-input-text,.ui-field-contain textarea.ui-input-text,.ui-field-contain .ui-input-search{width:78%;display:inline-block}.ui-hide-label input.ui-input-text,.ui-hide-label textarea.ui-input-text,.ui-hide-label .ui-input-search{width:100%}.ui-input-search input.ui-input-text{width:98%}}.ui-listview{margin:0}ol.ui-listview,ol.ui-listview .ui-li-divider{counter-reset:listnumbering}.ui-content .ui-listview{margin:-15px}.ui-collapsible-content > .ui-listview{margin:-10px -15px}.ui-content .ui-listview-inset{margin:1em 0}.ui-collapsible-content .ui-listview-inset{margin:.5em 0}.ui-listview,.ui-li{list-style:none;padding:0}.ui-li,.ui-li.ui-field-contain{display:block;margin:0;position:relative;overflow:visible;text-align:left;border-width:0;border-top-width:1px}.ui-li.ui-btn{margin:0}.ui-li .ui-btn-text a.ui-link-inherit{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-li-static{background-image:none}.ui-li-divider{padding:.5em 15px;font-size:14px;font-weight:bold}ol.ui-listview .ui-link-inherit:before,ol.ui-listview .ui-li-static:before,.ui-li-dec{font-size:.8em;display:inline-block;padding-right:.3em;font-weight:normal;counter-increment:listnumbering;content:counter(listnumbering) ". "}ol.ui-listview .ui-li-jsnumbering:before{content:""!important}.ui-listview-inset .ui-li{border-right-width:1px;border-left-width:1px}.ui-li-last,.ui-li.ui-field-contain.ui-li-last{border-bottom-width:1px}.ui-collapsible [class*="ui-body"] > .ui-listview:not(.ui-listview-inset) .ui-li-last{border-bottom-width:0}.ui-collapsible-content > .ui-listview:not(.ui-listview-inset) .ui-li:first-child{border-top-width:0}.ui-collapsible-content > .ui-listview:not(.ui-listview-inset),.ui-collapsible-content > .ui-listview:not(.ui-listview-inset) .ui-li-last{-webkit-border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:inherit;border-bottom-left-radius:inherit;border-bottom-right-radius:inherit}.ui-collapsible-content > .ui-listview:not(.ui-listview-inset) .ui-li-last .ui-li-link-alt{-webkit-border-bottom-right-radius:inherit;border-bottom-right-radius:inherit}.ui-li>.ui-btn-inner{display:block;position:relative;padding:0}.ui-li .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li{padding:.7em 15px;display:block}.ui-li-has-thumb .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-thumb{min-height:60px;padding-left:100px}.ui-li-has-icon .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-icon{min-height:20px;padding-left:40px}.ui-li-has-count .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-count,.ui-li-divider.ui-li-has-count{padding-right:45px}.ui-li-has-arrow .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-arrow{padding-right:40px}.ui-li-has-arrow.ui-li-has-count .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-arrow.ui-li-has-count{padding-right:75px}.ui-li-heading{font-size:16px;font-weight:bold;display:block;margin:.6em 0;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-li-desc{font-size:12px;font-weight:normal;display:block;margin:-.5em 0 .6em;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-li-thumb,.ui-listview .ui-li-icon{position:absolute;left:1px;top:0;max-height:80px;max-width:80px}.ui-listview .ui-li-icon{max-height:16px;max-width:16px;left:10px;top:.9em}.ui-li-thumb,.ui-listview .ui-li-icon,.ui-li-content{float:left;margin-right:10px}.ui-li-aside{float:right;width:50%;text-align:right;margin:.3em 0}@media all and (min-width:480px){.ui-li-aside{width:45%}}.ui-li-divider{cursor:default}.ui-li-has-alt .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-alt{padding-right:53px}.ui-li-has-alt.ui-li-has-count .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-alt.ui-li-has-count{padding-right:88px}.ui-li-has-count .ui-li-count{position:absolute;font-size:11px;font-weight:bold;padding:.2em .5em;top:50%;margin-top:-.9em;right:10px}.ui-li-has-count.ui-li-divider .ui-li-count,.ui-li-has-count .ui-link-inherit .ui-li-count{margin-top:-.95em}.ui-li-has-arrow.ui-li-has-count .ui-li-count{right:40px}.ui-li-has-alt.ui-li-has-count .ui-li-count{right:53px}.ui-li-link-alt{position:absolute;width:40px;height:100%;border-width:0;border-left-width:1px;top:0;right:0;margin:0;padding:0;z-index:2}.ui-li-link-alt .ui-btn{overflow:hidden;position:absolute;right:8px;top:50%;margin:-13px 0 0 0;border-bottom-width:1px;z-index:-1}.ui-li-link-alt .ui-btn-inner{padding:0;height:100%;position:absolute;width:100%;top:0;left:0}.ui-li-link-alt .ui-btn .ui-icon{right:50%;margin-right:-9px}.ui-li-link-alt .ui-btn-icon-notext .ui-btn-inner .ui-icon{position:absolute;top:50%;margin-top:-9px}.ui-listview * .ui-btn-inner > .ui-btn > .ui-btn-inner{border-top:0}.ui-listview-filter{border-width:0;overflow:hidden;margin:-15px -15px 15px -15px}.ui-collapsible-content .ui-listview-filter{margin:-10px -15px 10px -15px;border-bottom:inherit}.ui-listview-filter-inset{margin:-15px -5px;background:transparent}.ui-collapsible-content .ui-listview-filter-inset{margin:-5px;border-bottom-width:0}.ui-listview-filter .ui-input-search{margin:5px;width:auto;display:block}.ui-li.ui-screen-hidden{display:none}@media only screen and (min-device-width:768px) and (max-device-width:1024px){.ui-li .ui-btn-text{overflow:visible}}label.ui-slider{font-size:16px;line-height:1.4;font-weight:normal;margin:0 0 .3em;display:block}input.ui-slider-input,.ui-field-contain input.ui-slider-input{display:inline-block;width:50px;background-image:none;padding:.4em;margin:.5em 0;line-height:1.4;font-size:16px;outline:0}input.ui-slider-input.ui-mini,.ui-field-contain input.ui-slider-input.ui-mini{width:45px;margin:.25em 0;font-size:14px}.ui-field-contain input.ui-slider-input{margin:0}input.ui-slider-input,.ui-field-contain input.ui-slider-input{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;-ms-box-sizing:content-box;box-sizing:content-box}.ui-slider-input::-webkit-outer-spin-button{margin:0}select.ui-slider-switch{display:none}div.ui-slider{position:relative;display:inline-block;overflow:visible;height:15px;padding:0;margin:0 2% 0 20px;top:4px;width:65%}div.ui-slider-mini{height:12px;margin-left:10px;top:2px}div.ui-slider-bg{border:none;height:100%;padding-right:8px}.ui-controlgroup a.ui-slider-handle,a.ui-btn.ui-slider-handle{position:absolute;z-index:1;top:50%;width:28px;height:28px;margin:-15px 0 0 -15px;outline:0}a.ui-btn.ui-slider-handle .ui-btn-inner{padding:0;height:100%}div.ui-slider-mini a.ui-slider-handle{height:14px;width:14px;margin:-8px 0 0 -7px}div.ui-slider-mini a.ui-slider-handle .ui-btn-inner{height:30px;width:30px;padding:0;margin:-9px 0 0 -9px;border-top:none}@media all and (min-width:450px){.ui-field-contain label.ui-slider{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-field-contain div.ui-slider{width:43%}.ui-field-contain div.ui-slider-switch{width:5.5em}}div.ui-slider-switch{height:32px;margin-left:0;width:5.8em}a.ui-slider-handle-snapping{-webkit-transition:left 70ms linear;-moz-transition:left 70ms linear}div.ui-slider-switch .ui-slider-handle{margin:1px 0 0 -15px}.ui-slider-inneroffset{margin:0 16px;position:relative;z-index:1}div.ui-slider-switch.ui-slider-mini{width:5em;height:29px}div.ui-slider-switch.ui-slider-mini .ui-slider-inneroffset{margin:0 15px 0 14px}div.ui-slider-switch.ui-slider-mini .ui-slider-handle{width:25px;height:25px;margin:1px 0 0 -13px}div.ui-slider-switch.ui-slider-mini a.ui-slider-handle .ui-btn-inner{height:30px;width:30px;padding:0;margin:0}span.ui-slider-label{position:absolute;text-align:center;width:100%;overflow:hidden;font-size:16px;top:0;line-height:2;min-height:100%;border-width:0;white-space:nowrap}.ui-slider-mini span.ui-slider-label{font-size:14px}span.ui-slider-label-a{z-index:1;left:0;text-indent:-1.5em}span.ui-slider-label-b{z-index:0;right:0;text-indent:1.5em}.ui-slider-inline{width:120px;display:inline-block}
\ No newline at end of file
diff --git a/htdocs/jquery-mobile.js b/htdocs/jquery-mobile.js
new file mode 100644
index 0000000..e0d02a9
--- /dev/null
+++ b/htdocs/jquery-mobile.js
@@ -0,0 +1,2 @@
+/*! jQuery Mobile vGit Build: SHA1: b49cc06499abf8f987cf90f35349cfac0918c939 <> Date: Tue Oct 2 11:22:34 2012 -0700 jquerymobile.com | jquery.org/license !*/
+(function(a,b,c){typeof define=="function"&&define.amd?define(["jquery"],function(d){return c(d,a,b),d.mobile}):c(a.jQuery,a,b)})(this,document,function(a,b,c,d){(function(a,b,d){var e={};a.mobile=a.extend({},{version:"1.2.0",ns:"",subPageUrlKey:"ui-page",activePageClass:"ui-page-active",activeBtnClass:"ui-btn-active",focusClass:"ui-focus",ajaxEnabled:!0,hashListeningEnabled:!0,linkBindingEnabled:!0,defaultPageTransition:"fade",maxTransitionWidth:!1,minScrollBack:250,touchOverflowEnabled:!1,defaultDialogTransition:"pop",pageLoadErrorMessage:"Error Loading Page",pageLoadErrorMessageTheme:"e",phonegapNavigationEnabled:!1,autoInitializePage:!0,pushStateEnabled:!0,ignoreContentEnabled:!1,orientationChangeEnabled:!0,buttonMarkup:{hoverDelay:200},keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91},silentScroll:function(d){a.type(d)!=="number"&&(d=a.mobile.defaultHomeScroll),a.event.special.scrollstart.enabled=!1,setTimeout(function(){b.scrollTo(0,d),a(c).trigger("silentscroll",{x:0,y:d})},20),setTimeout(function(){a.event.special.scrollstart.enabled=!0},150)},nsNormalizeDict:e,nsNormalize:function(b){if(!b)return;return e[b]||(e[b]=a.camelCase(a.mobile.ns+b))},getInheritedTheme:function(a,b){var c=a[0],d="",e=/ui-(bar|body|overlay)-([a-z])\b/,f,g;while(c){f=c.className||"";if(f&&(g=e.exec(f))&&(d=g[2]))break;c=c.parentNode}return d||b||"a"},closestPageData:function(a){return a.closest(':jqmData(role="page"), :jqmData(role="dialog")').data("page")},enhanceable:function(a){return this.haveParents(a,"enhance")},hijackable:function(a){return this.haveParents(a,"ajax")},haveParents:function(b,c){if(!a.mobile.ignoreContentEnabled)return b;var d=b.length,e=a(),f,g,h;for(var i=0;i<d;i++){g=b.eq(i),h=!1,f=b[i];while(f){var j=f.getAttribute?f.getAttribute("data-"+a.mobile.ns+c):"";if(j==="false"){h=!0;break}f=f.parentNode}h||(e=e.add(g))}return e},getScreenHeight:function(){return b.innerHeight||a(b).height()}},a.mobile),a.fn.jqmData=function(b,c){var e;return typeof b!="undefined"&&(b&&(b=a.mobile.nsNormalize(b)),arguments.length<2||c===d?e=this.data(b):e=this.data(b,c)),e},a.jqmData=function(b,c,d){var e;return typeof c!="undefined"&&(e=a.data(b,c?a.mobile.nsNormalize(c):c,d)),e},a.fn.jqmRemoveData=function(b){return this.removeData(a.mobile.nsNormalize(b))},a.jqmRemoveData=function(b,c){return a.removeData(b,a.mobile.nsNormalize(c))},a.fn.removeWithDependents=function(){a.removeWithDependents(this)},a.removeWithDependents=function(b){var c=a(b);(c.jqmData("dependents")||a()).remove(),c.remove()},a.fn.addDependents=function(b){a.addDependents(a(this),b)},a.addDependents=function(b,c){var d=a(b).jqmData("dependents")||a();a(b).jqmData("dependents",a.merge(d,c))},a.fn.getEncodedText=function(){return a("<div/>").text(a(this).text()).html()},a.fn.jqmEnhanceable=function(){return a.mobile.enhanceable(this)},a.fn.jqmHijackable=function(){return a.mobile.hijackable(this)};var f=a.find,g=/:jqmData\(([^)]*)\)/g;a.find=function(b,c,d,e){return b=b.replace(g,"[data-"+(a.mobile.ns||"")+"$1]"),f.call(this,b,c,d,e)},a.extend(a.find,f),a.find.matches=function(b,c){return a.find(b,null,null,c)},a.find.matchesSelector=function(b,c){return a.find(c,null,null,[b]).length>0}})(a,this),function(a,b){var c=0,d=Array.prototype.slice,e=a.cleanData;a.cleanData=function(b){for(var c=0,d;(d=b[c])!=null;c++)try{a(d).triggerHandler("remove")}catch(f){}e(b)},a.widget=function(b,c,d){var e,f,g,h,i=b.split(".")[0];b=b.split(".")[1],e=i+"-"+b,d||(d=c,c=a.Widget),a.expr[":"][e]=function(b){return!!a.data(b,e)},a[i]=a[i]||{},f=a[i][b],g=a[i][b]=function(a,b){if(!this._createWidget)return new g(a,b);arguments.length&&this._createWidget(a,b)},a.extend(g,f,{version:d.version,_proto:a.extend({},d),_childConstructors:[]}),h=new c,h.options=a.widget.extend({},h.options),a.each(d,function(b,e){a.isFunction(e)&&(d[b]=function(){var a=function(){return c.prototype[b].apply(this,arguments)},d=function(a){return c.prototype[b].apply(this,a)};return function(){var b=this._super,c=this._superApply,f;return this._super=a,this._superApply=d,f=e.apply(this,arguments),this._super=b,this._superApply=c,f}}())}),g.prototype=a.widget.extend(h,{widgetEventPrefix:b},d,{constructor:g,namespace:i,widgetName:b,widgetBaseClass:e,widgetFullName:e}),f?(a.each(f._childConstructors,function(b,c){var d=c.prototype;a.widget(d.namespace+"."+d.widgetName,g,c._proto)}),delete f._childConstructors):c._childConstructors.push(g),a.widget.bridge(b,g)},a.widget.extend=function(c){var e=d.call(arguments,1),f=0,g=e.length,h,i;for(;f<g;f++)for(h in e[f])i=e[f][h],e[f].hasOwnProperty(h)&&i!==b&&(c[h]=a.isPlainObject(i)?a.widget.extend({},c[h],i):i);return c},a.widget.bridge=function(c,e){var f=e.prototype.widgetFullName;a.fn[c]=function(g){var h=typeof g=="string",i=d.call(arguments,1),j=this;return g=!h&&i.length?a.widget.extend.apply(null,[g].concat(i)):g,h?this.each(function(){var d,e=a.data(this,f);if(!e)return a.error("cannot call methods on "+c+" prior to initialization; "+"attempted to call method '"+g+"'");if(!a.isFunction(e[g])||g.charAt(0)==="_")return a.error("no such method '"+g+"' for "+c+" widget instance");d=e[g].apply(e,i);if(d!==e&&d!==b)return j=d&&d.jquery?j.pushStack(d.get()):d,!1}):this.each(function(){var b=a.data(this,f);b?b.option(g||{})._init():new e(g,this)}),j}},a.Widget=function(a,b){},a.Widget._childConstructors=[],a.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{disabled:!1,create:null},_createWidget:function(b,d){d=a(d||this.defaultElement||this)[0],this.element=a(d),this.uuid=c++,this.eventNamespace="."+this.widgetName+this.uuid,this.options=a.widget.extend({},this.options,this._getCreateOptions(),b),this.bindings=a(),this.hoverable=a(),this.focusable=a(),d!==this&&(a.data(d,this.widgetName,this),a.data(d,this.widgetFullName,this),this._on({remove:"destroy"}),this.document=a(d.style?d.ownerDocument:d.document||d),this.window=a(this.document[0].defaultView||this.document[0].parentWindow)),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:a.noop,_getCreateEventData:a.noop,_create:a.noop,_init:a.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetName).removeData(this.widgetFullName).removeData(a.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:a.noop,widget:function(){return this.element},option:function(c,d){var e=c,f,g,h;if(arguments.length===0)return a.widget.extend({},this.options);if(typeof c=="string"){e={},f=c.split("."),c=f.shift();if(f.length){g=e[c]=a.widget.extend({},this.options[c]);for(h=0;h<f.length-1;h++)g[f[h]]=g[f[h]]||{},g=g[f[h]];c=f.pop();if(d===b)return g[c]===b?null:g[c];g[c]=d}else{if(d===b)return this.options[c]===b?null:this.options[c];e[c]=d}}return this._setOptions(e),this},_setOptions:function(a){var b;for(b in a)this._setOption(b,a[b]);return this},_setOption:function(a,b){return this.options[a]=b,a==="disabled"&&(this.widget().toggleClass(this.widgetFullName+"-disabled ui-state-disabled",!!b).attr("aria-disabled",b),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")),this},enable:function(){return this._setOption("disabled",!1)},disable:function(){return this._setOption("disabled",!0)},_on:function(b,c){c?(b=a(b),this.bindings=this.bindings.add(b)):(c=b,b=this.element);var d=this;a.each(c,function(c,e){function f(){if(d.options.disabled===!0||a(this).hasClass("ui-state-disabled"))return;return(typeof e=="string"?d[e]:e).apply(d,arguments)}typeof e!="string"&&(f.guid=e.guid=e.guid||f.guid||a.guid++);var g=c.match(/^(\w+)\s*(.*)$/),h=g[1]+d.eventNamespace,i=g[2];i?d.widget().delegate(i,h,f):b.bind(h,f)})},_off:function(a,b){b=(b||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,a.unbind(b).undelegate(b)},_delay:function(a,b){function c(){return(typeof a=="string"?d[a]:a).apply(d,arguments)}var d=this;return setTimeout(c,b||0)},_hoverable:function(b){this.hoverable=this.hoverable.add(b),this._on(b,{mouseenter:function(b){a(b.currentTarget).addClass("ui-state-hover")},mouseleave:function(b){a(b.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(b){this.focusable=this.focusable.add(b),this._on(b,{focusin:function(b){a(b.currentTarget).addClass("ui-state-focus")},focusout:function(b){a(b.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(b,c,d){var e,f,g=this.options[b];d=d||{},c=a.Event(c),c.type=(b===this.widgetEventPrefix?b:this.widgetEventPrefix+b).toLowerCase(),c.target=this.element[0],f=c.originalEvent;if(f)for(e in f)e in c||(c[e]=f[e]);return this.element.trigger(c,d),!(a.isFunction(g)&&g.apply(this.element[0],[c].concat(d))===!1||c.isDefaultPrevented())}},a.each({show:"fadeIn",hide:"fadeOut"},function(b,c){a.Widget.prototype["_"+b]=function(d,e,f){typeof e=="string"&&(e={effect:e});var g,h=e?e===!0||typeof e=="number"?c:e.effect||c:b;e=e||{},typeof e=="number"&&(e={duration:e}),g=!a.isEmptyObject(e),e.complete=f,e.delay&&d.delay(e.delay),g&&a.effects&&(a.effects.effect[h]||a.uiBackCompat!==!1&&a.effects[h])?d[b](e):h!==b&&d[h]?d[h](e.duration,e.easing,f):d.queue(function(c){a(this)[b](),f&&f.call(d[0]),c()})}}),a.uiBackCompat!==!1&&(a.Widget.prototype._getCreateOptions=function(){return a.metadata&&a.metadata.get(this.element[0])[this.widgetName]})}(a),function(a,b){a.widget("mobile.widget",{_createWidget:function(){a.Widget.prototype._createWidget.apply(this,arguments),this._trigger("init")},_getCreateOptions:function(){var c=this.element,d={};return a.each(this.options,function(a){var e=c.jqmData(a.replace(/[A-Z]/g,function(a){return"-"+a.toLowerCase()}));e!==b&&(d[a]=e)}),d},enhanceWithin:function(b,c){this.enhance(a(this.options.initSelector,a(b)),c)},enhance:function(b,c){var d,e,f=a(b),g=this;f=a.mobile.enhanceable(f),c&&f.length&&(d=a.mobile.closestPageData(f),e=d&&d.keepNativeSelector()||"",f=f.not(e)),f[this.widgetName]()},raise:function(a){throw"Widget ["+this.widgetName+"]: "+a}})}(a),function(a,b){a.extend(a.mobile,{loadingMessageTextVisible:d,loadingMessageTheme:d,loadingMessage:d,showPageLoadingMsg:function(b,c,d){a.mobile.loading("show",b,c,d)},hidePageLoadingMsg:function(){a.mobile.loading("hide")},loading:function(){this.loaderWidget.loader.apply(this.loaderWidget,arguments)}});var c="ui-loader",e=a("html"),f=a(b);a.widget("mobile.loader",{options:{theme:"a",textVisible:!1,html:"",text:"loading"},defaultHtml:"<div class='"+c+"'>"+"<span class='ui-icon ui-icon-loading'></span>"+"<h1></h1>"+"</div>",fakeFixLoader:function(){var b=a("."+a.mobile.activeBtnClass).first();this.element.css({top:a.support.scrollTop&&f.scrollTop()+f.height()/2||b.length&&b.offset().top||100})},checkLoaderPosition:function(){var b=this.element.offset(),c=f.scrollTop(),d=a.mobile.getScreenHeight();if(b.top<c||b.top-c>d)this.element.addClass("ui-loader-fakefix"),this.fakeFixLoader(),f.unbind("scroll",this.checkLoaderPosition).bind("scroll",this.fakeFixLoader)},resetHtml:function(){this.element.html(a(this.defaultHtml).html())},show:function(b,g,h){var i,j,k,l;this.resetHtml(),a.type(b)==="object"?(l=a.extend({},this.options,b),b=l.theme||a.mobile.loadingMessageTheme):(l=this.options,b=b||a.mobile.loadingMessageTheme||l.theme),j=g||a.mobile.loadingMessage||l.text,e.addClass("ui-loading");if(a.mobile.loadingMessage!==!1||l.html)a.mobile.loadingMessageTextVisible!==d?i=a.mobile.loadingMessageTextVisible:i=l.textVisible,this.element.attr("class",c+" ui-corner-all ui-body-"+b+" ui-loader-"+(i||g||b.text?"verbose":"default")+(l.textonly||h?" ui-loader-textonly":"")),l.html?this.element.html(l.html):this.element.find("h1").text(j),this.element.appendTo(a.mobile.pageContainer),this.checkLoaderPosition(),f.bind("scroll",a.proxy(this.checkLoaderPosition,this))},hide:function(){e.removeClass("ui-loading"),a.mobile.loadingMessage&&this.element.removeClass("ui-loader-fakefix"),a(b).unbind("scroll",a.proxy(this.fakeFixLoader,this)),a(b).unbind("scroll",a.proxy(this.checkLoaderPosition,this))}}),f.bind("pagecontainercreate",function(){a.mobile.loaderWidget=a.mobile.loaderWidget||a(a.mobile.loader.prototype.defaultHtml).loader()})}(a,this),function(a,b,c,d){function x(a){while(a&&typeof a.originalEvent!="undefined")a=a.originalEvent;return a}function y(b,c){var e=b.type,f,g,i,k,l,m,n,o,p;b=a.Event(b),b.type=c,f=b.originalEvent,g=a.event.props,e.search(/^(mouse|click)/)>-1&&(g=j);if(f)for(n=g.length,k;n;)k=g[--n],b[k]=f[k];e.search(/mouse(down|up)|click/)>-1&&!b.which&&(b.which=1);if(e.search(/^touch/)!==-1){i=x(f),e=i.touches,l=i.changedTouches,m=e&&e.length?e[0]:l&&l.length?l[0]:d;if(m)for(o=0,p=h.length;o<p;o++)k=h[o],b[k]=m[k]}return b}function z(b){var c={},d,f;while(b){d=a.data(b,e);for(f in d)d[f]&&(c[f]=c.hasVirtualBinding=!0);b=b.parentNode}return c}function A(b,c){var d;while(b){d=a.data(b,e);if(d&&(!c||d[c]))return b;b=b.parentNode}return null}function B(){r=!1}function C(){r=!0}function D(){v=0,p.length=0,q=!1,C()}function E(){B()}function F(){G(),l=setTimeout(function(){l=0,D()},a.vmouse.resetTimerDuration)}function G(){l&&(clearTimeout(l),l=0)}function H(b,c,d){var e;if(d&&d[b]||!d&&A(c.target,b))e=y(c,b),a(c.target).trigger(e);return e}function I(b){var c=a.data(b.target,f);if(!q&&(!v||v!==c)){var d=H("v"+b.type,b);d&&(d.isDefaultPrevented()&&b.preventDefault(),d.isPropagationStopped()&&b.stopPropagation(),d.isImmediatePropagationStopped()&&b.stopImmediatePropagation())}}function J(b){var c=x(b).touches,d,e;if(c&&c.length===1){d=b.target,e=z(d);if(e.hasVirtualBinding){v=u++,a.data(d,f,v),G(),E(),o=!1;var g=x(b).touches[0];m=g.pageX,n=g.pageY,H("vmouseover",b,e),H("vmousedown",b,e)}}}function K(a){if(r)return;o||H("vmousecancel",a,z(a.target)),o=!0,F()}function L(b){if(r)return;var c=x(b).touches[0],d=o,e=a.vmouse.moveDistanceThreshold,f=z(b.target);o=o||Math.abs(c.pageX-m)>e||Math.abs(c.pageY-n)>e,o&&!d&&H("vmousecancel",b,f),H("vmousemove",b,f),F()}function M(a){if(r)return;C();var b=z(a.target),c;H("vmouseup",a,b);if(!o){var d=H("vclick",a,b);d&&d.isDefaultPrevented()&&(c=x(a).changedTouches[0],p.push({touchID:v,x:c.clientX,y:c.clientY}),q=!0)}H("vmouseout",a,b),o=!1,F()}function N(b){var c=a.data(b,e),d;if(c)for(d in c)if(c[d])return!0;return!1}function O(){}function P(b){var c=b.substr(1);return{setup:function(d,f){N(this)||a.data(this,e,{});var g=a.data(this,e);g[b]=!0,k[b]=(k[b]||0)+1,k[b]===1&&t.bind(c,I),a(this).bind(c,O),s&&(k.touchstart=(k.touchstart||0)+1,k.touchstart===1&&t.bind("touchstart",J).bind("touchend",M).bind("touchmove",L).bind("scroll",K))},teardown:function(d,f){--k[b],k[b]||t.unbind(c,I),s&&(--k.touchstart,k.touchstart||t.unbind("touchstart",J).unbind("touchmove",L).unbind("touchend",M).unbind("scroll",K));var g=a(this),h=a.data(this,e);h&&(h[b]=!1),g.unbind(c,O),N(this)||g.removeData(e)}}}var e="virtualMouseBindings",f="virtualTouchID",g="vmouseover vmousedown vmousemove vmouseup vclick vmouseout vmousecancel".split(" "),h="clientX clientY pageX pageY screenX screenY".split(" "),i=a.event.mouseHooks?a.event.mouseHooks.props:[],j=a.event.props.concat(i),k={},l=0,m=0,n=0,o=!1,p=[],q=!1,r=!1,s="addEventListener"in c,t=a(c),u=1,v=0,w;a.vmouse={moveDistanceThreshold:10,clickDistanceThreshold:10,resetTimerDuration:1500};for(var Q=0;Q<g.length;Q++)a.event.special[g[Q]]=P(g[Q]);s&&c.addEventListener("click",function(b){var c=p.length,d=b.target,e,g,h,i,j,k;if(c){e=b.clientX,g=b.clientY,w=a.vmouse.clickDistanceThreshold,h=d;while(h){for(i=0;i<c;i++){j=p[i],k=0;if(h===d&&Math.abs(j.x-e)<w&&Math.abs(j.y-g)<w||a.data(h,f)===j.touchID){b.preventDefault(),b.stopPropagation();return}}h=h.parentNode}}},!0)}(a,b,c),function(a,b){var d={touch:"ontouchend"in c};a.mobile=a.mobile||{},a.mobile.support=a.mobile.support||{},a.extend(a.support,d),a.extend(a.mobile.support,d)}(a),function(a,b,d){function j(b,c,d){var e=d.type;d.type=c,a.event.handle.call(b,d),d.type=e}a.each("touchstart touchmove touchend tap taphold swipe swipeleft swiperight scrollstart scrollstop".split(" "),function(b,c){a.fn[c]=function(a){return a?this.bind(c,a):this.trigger(c)},a.attrFn&&(a.attrFn[c]=!0)});var e=a.mobile.support.touch,f="touchmove scroll",g=e?"touchstart":"mousedown",h=e?"touchend":"mouseup",i=e?"touchmove":"mousemove";a.event.special.scrollstart={enabled:!0,setup:function(){function g(a,c){d=c,j(b,d?"scrollstart":"scrollstop",a)}var b=this,c=a(b),d,e;c.bind(f,function(b){if(!a.event.special.scrollstart.enabled)return;d||g(b,!0),clearTimeout(e),e=setTimeout(function(){g(b,!1)},50)})}},a.event.special.tap={tapholdThreshold:750,setup:function(){var b=this,d=a(b);d.bind("vmousedown",function(e){function i(){clearTimeout(h)}function k(){i(),d.unbind("vclick",l).unbind("vmouseup",i),a(c).unbind("vmousecancel",k)}function l(a){k(),f===a.target&&j(b,"tap",a)}if(e.which&&e.which!==1)return!1;var f=e.target,g=e.originalEvent,h;d.bind("vmouseup",i).bind("vclick",l),a(c).bind("vmousecancel",k),h=setTimeout(function(){j(b,"taphold",a.Event("taphold",{target:f}))},a.event.special.tap.tapholdThreshold)})}},a.event.special.swipe={scrollSupressionThreshold:30,durationThreshold:1e3,horizontalDistanceThreshold:30,verticalDistanceThreshold:75,setup:function(){var b=this,c=a(b);c.bind(g,function(b){function j(b){if(!f)return;var c=b.originalEvent.touches?b.originalEvent.touches[0]:b;g={time:(new Date).getTime(),coords:[c.pageX,c.pageY]},Math.abs(f.coords[0]-g.coords[0])>a.event.special.swipe.scrollSupressionThreshold&&b.preventDefault()}var e=b.originalEvent.touches?b.originalEvent.touches[0]:b,f={time:(new Date).getTime(),coords:[e.pageX,e.pageY],origin:a(b.target)},g;c.bind(i,j).one(h,function(b){c.unbind(i,j),f&&g&&g.time-f.time<a.event.special.swipe.durationThreshold&&Math.abs(f.coords[0]-g.coords[0])>a.event.special.swipe.horizontalDistanceThreshold&&Math.abs(f.coords[1]-g.coords[1])<a.event.special.swipe.verticalDistanceThreshold&&f.origin.trigger("swipe").trigger(f.coords[0]>g.coords[0]?"swipeleft":"swiperight"),f=g=d})})}},a.each({scrollstop:"scrollstart",taphold:"tap",swipeleft:"swipe",swiperight:"swipe"},function(b,c){a.event.special[b]={setup:function(){a(this).bind(c,a.noop)}}})}(a,this),function(a,c){a.extend(a.support,{orientation:"orientation"in b&&"onorientationchange"in b})}(a),function(a){a.event.special.throttledresize={setup:function(){a(this).bind("resize",c)},teardown:function(){a(this).unbind("resize",c)}};var b=250,c=function(){f=(new Date).getTime(),g=f-d,g>=b?(d=f,a(this).trigger("throttledresize")):(e&&clearTimeout(e),e=setTimeout(c,b-g))},d=0,e,f,g}(a),function(a,b){function o(){var a=g();a!==h&&(h=a,d.trigger(e))}var d=a(b),e="orientationchange",f,g,h,i,j,k={0:!0,180:!0};if(a.support.orientation){var l=b.innerWidth||a(b).width(),m=b.innerHeight||a(b).height(),n=50;i=l>m&&l-m>n,j=k[b.orientation];if(i&&j||!i&&!j)k={"-90":!0,90:!0}}a.event.special.orientationchange=a.extend({},a.event.special.orientationchange,{setup:function(){if(a.support.orientation&&!a.event.special.orientationchange.disabled)return!1;h=g(),d.bind("throttledresize",o)},teardown:function(){if(a.support.orientation&&!a.event.special.orientationchange.disabled)return!1;d.unbind("throttledresize",o)},add:function(a){var b=a.handler;a.handler=function(a){return a.orientation=g(),b.apply(this,arguments)}}}),a.event.special.orientationchange.orientation=g=function(){var d=!0,e=c.documentElement;return a.support.orientation?d=k[b.orientation]:d=e&&e.clientWidth/e.clientHeight<1.1,d?"portrait":"landscape"},a.fn[e]=function(a){return a?this.bind(e,a):this.trigger(e)},a.attrFn&&(a.attrFn[e]=!0)}(a,this),function(a,d){var e=a(b),f=a("html");a.mobile.media=function(){var b={},d=a("<div id='jquery-mediatest'></div>"),e=a("<body>").append(d);return function(a){if(!(a in b)){var g=c.createElement("style"),h="@media "+a+" { #jquery-mediatest { position:absolute; } }";g.type="text/css",g.styleSheet?g.styleSheet.cssText=h:g.appendChild(c.createTextNode(h)),f.prepend(e).prepend(g),b[a]=d.css("position")==="absolute",e.add(g).remove()}return b[a]}}()}(a),function(a,d){function e(a){var b=a.charAt(0).toUpperCase()+a.substr(1),c=(a+" "+h.join(b+" ")+b).split(" ");for(var e in c)if(g[c[e]]!==d)return!0}function m(a,b,d){var e=c.createElement("div"),f=function(a){return a.charAt(0).toUpperCase()+a.substr(1)},g=function(a){return"-"+a.charAt(0).toLowerCase()+a.substr(1)+"-"},i=function(c){var d=g(c)+a+": "+b+";",h=f(c),i=h+f(a);e.setAttribute("style",d),!e.style[i]||(k=!0)},j=d?[d]:h,k;for(var l=0;l<j.length;l++)i(j[l]);return!!k}function n(){var b="transform-3d";return m("perspective","10px","moz")||a.mobile.media("(-"+h.join("-"+b+"),(-")+"-"+b+"),("+b+")")}function o(){var b=location.protocol+"//"+location.host+location.pathname+"ui-dir/",c=a("head base"),d=null,e="",g,h;return c.length?e=c.attr("href"):c=d=a("<base>",{href:b}).appendTo("head"),g=a("<a href='testurl' />").prependTo(f),h=g[0].href,c[0].href=e||location.pathname,d&&d.remove(),h.indexOf(b)===0}function p(){var a=c.createElement("x"),d=c.documentElement,e=b.getComputedStyle,f;return"pointerEvents"in a.style?(a.style.pointerEvents="auto",a.style.pointerEvents="x",d.appendChild(a),f=e&&e(a,"").pointerEvents==="auto",d.removeChild(a),!!f):!1}function q(){var a=c.createElement("div");return typeof a.getBoundingClientRect!="undefined"}var f=a("<body>").prependTo("html"),g=f[0].style,h=["Webkit","Moz","O"],i="palmGetResource"in b,j=b.opera,k=b.operamini&&{}.toString.call(b.operamini)==="[object OperaMini]",l=b.blackberry&&!e("-webkit-transform");a.extend(a.mobile,{browser:{}}),a.mobile.browser.ie=function(){var a=3,b=c.createElement("div"),d=b.all||[];do b.innerHTML="<!--[if gt IE "+ ++a+"]><br><![endif]-->";while(d[0]);return a>4?a:!a}(),a.extend(a.support,{cssTransitions:"WebKitTransitionEvent"in b||m("transition","height 100ms linear")&&!j,pushState:"pushState"in history&&"replaceState"in history,mediaquery:a.mobile.media("only all"),cssPseudoElement:!!e("content"),touchOverflow:!!e("overflowScrolling"),cssTransform3d:n(),boxShadow:!!e("boxShadow")&&!l,scrollTop:("pageXOffset"in b||"scrollTop"in c.documentElement||"scrollTop"in f[0])&&!i&&!k,dynamicBaseTag:o(),cssPointerEvents:p(),boundingRect:q()}),f.remove();var r=function(){var a=b.navigator.userAgent;return a.indexOf("Nokia")>-1&&(a.indexOf("Symbian/3")>-1||a.indexOf("Series60/5")>-1)&&a.indexOf("AppleWebKit")>-1&&a.match(/(BrowserNG|NokiaBrowser)\/7\.[0-3]/)}();a.mobile.gradeA=function(){return(a.support.mediaquery||a.mobile.browser.ie&&a.mobile.browser.ie>=7)&&(a.support.boundingRect||a.fn.jquery.match(/1\.[0-7+]\.[0-9+]?/)!==null)},a.mobile.ajaxBlacklist=b.blackberry&&!b.WebKitPoint||k||r,r&&a(function(){a("head link[rel='stylesheet']").attr("rel","alternate stylesheet").attr("rel","stylesheet")}),a.support.boxShadow||a("html").addClass("ui-mobile-nosupport-boxshadow")}(a),function(a,b){a.widget("mobile.page",a.mobile.widget,{options:{theme:"c",domCache:!1,keepNativeDefault:":jqmData(role='none'), :jqmData(role='nojs')"},_create:function(){var a=this;if(a._trigger("beforecreate")===!1)return!1;a.element.attr("tabindex","0").addClass("ui-page ui-body-"+a.options.theme).bind("pagebeforehide",function(){a.removeContainerBackground()}).bind("pagebeforeshow",function(){a.setContainerBackground()})},removeContainerBackground:function(){a.mobile.pageContainer.removeClass("ui-overlay-"+a.mobile.getInheritedTheme(this.element.parent()))},setContainerBackground:function(b){this.options.theme&&a.mobile.pageContainer.addClass("ui-overlay-"+(b||this.options.theme))},keepNativeSelector:function(){var b=this.options,c=b.keepNative&&a.trim(b.keepNative);return c&&b.keepNative!==b.keepNativeDefault?[b.keepNative,b.keepNativeDefault].join(", "):b.keepNativeDefault}})}(a),function(a,b,d){function k(a){return a=a||location.href,"#"+a.replace(/^[^#]*#?(.*)$/,"$1")}var e="hashchange",f=c,g,h=a.event.special,i=f.documentMode,j="on"+e in b&&(i===d||i>7);a.fn[e]=function(a){return a?this.bind(e,a):this.trigger(e)},a.fn[e].delay=50,h[e]=a.extend(h[e],{setup:function(){if(j)return!1;a(g.start)},teardown:function(){if(j)return!1;a(g.stop)}}),g=function(){function n(){var c=k(),d=m(h);c!==h?(l(h=c,d),a(b).trigger(e)):d!==h&&(location.href=location.href.replace(/#.*/,"")+d),g=setTimeout(n,a.fn[e].delay)}var c={},g,h=k(),i=function(a){return a},l=i,m=i;return c.start=function(){g||n()},c.stop=function(){g&&clearTimeout(g),g=d},a.browser.msie&&!j&&function(){var b,d;c.start=function(){b||(d=a.fn[e].src,d=d&&d+k(),b=a('<iframe tabindex="-1" title="empty"/>').hide().one("load",function(){d||l(k()),n()}).attr("src",d||"javascript:0").insertAfter("body")[0].contentWindow,f.onpropertychange=function(){try{event.propertyName==="title"&&(b.document.title=f.title)}catch(a){}})},c.stop=i,m=function(){return k(b.location.href)},l=function(c,d){var g=b.document,h=a.fn[e].domain;c!==d&&(g.title=f.title,g.open(),h&&g.write('<script>document.domain="'+h+'"</script>'),g.close(),b.location.hash=c)}}(),c}()}(a,this),function(a,b,c){var d=function(d){return d===c&&(d=!0),function(c,e,f,g){var h=new a.Deferred,i=e?" reverse":"",j=a.mobile.urlHistory.getActive(),k=j.lastScroll||a.mobile.defaultHomeScroll,l=a.mobile.getScreenHeight(),m=a.mobile.maxTransitionWidth!==!1&&a(b).width()>a.mobile.maxTransitionWidth,n=!a.support.cssTransitions||m||!c||c==="none"||Math.max(a(b).scrollTop(),k)>a.mobile.getMaxScrollForTransition(),o=" ui-page-pre-in",p=function(){a.mobile.pageContainer.toggleClass("ui-mobile-viewport-transitioning viewport-"+c)},q=function(){a.event.special.scrollstart.enabled=!1,b.scrollTo(0,k),setTimeout(function(){a.event.special.scrollstart.enabled=!0},150)},r=function(){g.removeClass(a.mobile.activePageClass+" out in reverse "+c).height("")},s=function(){d?g.animationComplete(t):t(),g.height(l+a(b).scrollTop()).addClass(c+" out"+i)},t=function(){g&&d&&r(),u()},u=function(){f.css("z-index",-10),f.addClass(a.mobile.activePageClass+o),a.mobile.focusPage(f),f.height(l+k),q(),f.css("z-index",""),n||f.animationComplete(v),f.removeClass(o).addClass(c+" in"+i),n&&v()},v=function(){d||g&&r(),f.removeClass("out in reverse "+c).height(""),p(),a(b).scrollTop()!==k&&q(),h.resolve(c,e,f,g,!0)};return p(),g&&!n?s():t(),h.promise()}},e=d(),f=d(!1),g=function(){return a.mobile.getScreenHeight()*3};a.mobile.defaultTransitionHandler=e,a.mobile.transitionHandlers={"default":a.mobile.defaultTransitionHandler,sequential:e,simultaneous:f},a.mobile.transitionFallbacks={},a.mobile._maybeDegradeTransition=function(b){return b&&!a.support.cssTransform3d&&a.mobile.transitionFallbacks[b]&&(b=a.mobile.transitionFallbacks[b]),b},a.mobile.getMaxScrollForTransition=a.mobile.getMaxScrollForTransition||g}(a,this),function(a,d){function u(b){!!i&&(!i.closest("."+a.mobile.activePageClass).length||b)&&i.removeClass(a.mobile.activeBtnClass),i=null}function v(){m=!1,l.length>0&&a.mobile.changePage.apply(null,l.pop())}function z(b,c,d,e){c&&c.data("page")._trigger("beforehide",null,{nextPage:b}),b.data("page")._trigger("beforeshow",null,{prevPage:c||a("")}),a.mobile.hidePageLoadingMsg(),d=a.mobile._maybeDegradeTransition(d);var f=a.mobile.transitionHandlers[d||"default"]||a.mobile.defaultTransitionHandler,g=f(d,e,b,c);return g.done(function(){c&&c.data("page")._trigger("hide",null,{nextPage:b}),b.data("page")._trigger("show",null,{prevPage:c||a("")})}),g}function A(){var b=a("."+a.mobile.activePageClass),c=parseFloat(b.css("padding-top")),d=parseFloat(b.css("padding-bottom")),e=parseFloat(b.css("border-top-width")),f=parseFloat(b.css("border-bottom-width"));b.css("min-height",s()-c-d-e-f)}function B(b,c){c&&b.attr("data-"+a.mobile.ns+"role",c),b.page()}function C(a){while(a){if(typeof a.nodeName=="string"&&a.nodeName.toLowerCase()==="a")break;a=a.parentNode}return a}function D(b){var c=a(b).closest(".ui-page").jqmData("url"),d=q.hrefNoHash;if(!c||!h.isPath(c))c=d;return h.makeUrlAbsolute(c,d)}var e=a(b),f=a("html"),g=a("head"),h={urlParseRE:/^(((([^:\/#\?]+:)?(?:(\/\/)((?:(([^:@\/#\?]+)(?:\:([^:@\/#\?]+))?)@)?(([^:\/#\?\]\[]+|\[[^\/\]@#?]+\])(?:\:([0-9]+))?))?)?)?((\/?(?:[^\/\?#]+\/+)*)([^\?#]*)))?(\?[^#]+)?)(#.*)?/,getLocation:function(a){var b=a?this.parseUrl(a):location,c=this.parseUrl(a||location.href).hash;return c=c==="#"?"":c,b.protocol+"//"+b.host+b.pathname+b.search+c},parseLocation:function(){return this.parseUrl(this.getLocation())},parseUrl:function(b){if(a.type(b)==="object")return b;var c=h.urlParseRE.exec(b||"")||[];return{href:c[0]||"",hrefNoHash:c[1]||"",hrefNoSearch:c[2]||"",domain:c[3]||"",protocol:c[4]||"",doubleSlash:c[5]||"",authority:c[6]||"",username:c[8]||"",password:c[9]||"",host:c[10]||"",hostname:c[11]||"",port:c[12]||"",pathname:c[13]||"",directory:c[14]||"",filename:c[15]||"",search:c[16]||"",hash:c[17]||""}},makePathAbsolute:function(a,b){if(a&&a.charAt(0)==="/")return a;a=a||"",b=b?b.replace(/^\/|(\/[^\/]*|[^\/]+)$/g,""):"";var c=b?b.split("/"):[],d=a.split("/");for(var e=0;e<d.length;e++){var f=d[e];switch(f){case".":break;case"..":c.length&&c.pop();break;default:c.push(f)}}return"/"+c.join("/")},isSameDomain:function(a,b){return h.parseUrl(a).domain===h.parseUrl(b).domain},isRelativeUrl:function(a){return h.parseUrl(a).protocol===""},isAbsoluteUrl:function(a){return h.parseUrl(a).protocol!==""},makeUrlAbsolute:function(a,b){if(!h.isRelativeUrl(a))return a;b===d&&(b=q);var c=h.parseUrl(a),e=h.parseUrl(b),f=c.protocol||e.protocol,g=c.protocol?c.doubleSlash:c.doubleSlash||e.doubleSlash,i=c.authority||e.authority,j=c.pathname!=="",k=h.makePathAbsolute(c.pathname||e.filename,e.pathname),l=c.search||!j&&e.search||"",m=c.hash;return f+g+i+k+l+m},addSearchParams:function(b,c){var d=h.parseUrl(b),e=typeof c=="object"?a.param(c):c,f=d.search||"?";return d.hrefNoSearch+f+(f.charAt(f.length-1)!=="?"?"&":"")+e+(d.hash||"")},convertUrlToDataUrl:function(a){var c=h.parseUrl(a);return h.isEmbeddedPage(c)?c.hash.split(n)[0].replace(/^#/,""):h.isSameDomain(c,q)?c.hrefNoHash.replace(q.domain,"").split(n)[0]:b.decodeURIComponent(a)},get:function(a){return a===d&&(a=h.parseLocation().hash),h.stripHash(a).replace(/[^\/]*\.[^\/*]+$/,"")},getFilePath:function(b){var c="&"+a.mobile.subPageUrlKey;return b&&b.split(c)[0].split(n)[0]},set:function(a){location.hash=a},isPath:function(a){return/\//.test(a)},clean:function(a){return a.replace(q.domain,"")},stripHash:function(a){return a.replace(/^#/,"")},cleanHash:function(a){return h.stripHash(a.replace(/\?.*$/,"").replace(n,""))},isHashValid:function(a){return/^#[^#]+$/.test(a)},isExternal:function(a){var b=h.parseUrl(a);return b.protocol&&b.domain!==p.domain?!0:!1},hasProtocol:function(a){return/^(:?\w+:)/.test(a)},isFirstPageUrl:function(b){var c=h.parseUrl(h.makeUrlAbsolute(b,q)),e=c.hrefNoHash===p.hrefNoHash||r&&c.hrefNoHash===q.hrefNoHash,f=a.mobile.firstPage,g=f&&f[0]?f[0].id:d;return e&&(!c.hash||c.hash==="#"||g&&c.hash.replace(/^#/,"")===g)},isEmbeddedPage:function(a){var b=h.parseUrl(a);return b.protocol!==""?b.hash&&(b.hrefNoHash===p.hrefNoHash||r&&b.hrefNoHash===q.hrefNoHash):/^#/.test(b.href)},isPermittedCrossDomainRequest:function(b,c){return a.mobile.allowCrossDomainPages&&b.protocol==="file:"&&c.search(/^https?:/)!==-1}},i=null,j={stack:[],activeIndex:0,getActive:function(){return j.stack[j.activeIndex]},getPrev:function(){return j.stack[j.activeIndex-1]},getNext:function(){return j.stack[j.activeIndex+1]},addNew:function(a,b,c,d,e){j.getNext()&&j.clearForward(),j.stack.push({url:a,transition:b,title:c,pageUrl:d,role:e}),j.activeIndex=j.stack.length-1},clearForward:function(){j.stack=j.stack.slice(0,j.activeIndex+1)},directHashChange:function(b){var c,e,f,g=this.getActive();a.each(j.stack,function(a,d){decodeURIComponent(b.currentUrl)===decodeURIComponent(d.url)&&(c=a<j.activeIndex,e=!c,f=a)}),this.activeIndex=f!==d?f:this.activeIndex,c?(b.either||b.isBack)(!0):e&&(b.either||b.isForward)(!1)},ignoreNextHashChange:!1},k="[tabindex],a,button:visible,select:visible,input",l=[],m=!1,n="&ui-state=dialog",o=g.children("base"),p=h.parseLocation(),q=o.length?h.parseUrl(h.makeUrlAbsolute(o.attr("href"),p.href)):p,r=p.hrefNoHash!==q.hrefNoHash,s=a.mobile.getScreenHeight,t=a.support.dynamicBaseTag?{element:o.length?o:a("<base>",{href:q.hrefNoHash}).prependTo(g),set:function(a){t.element.attr("href",h.makeUrlAbsolute(a,q))},reset:function(){t.element.attr("href",q.hrefNoHash)}}:d;a.mobile.back=function(){var a=b.navigator;this.phonegapNavigationEnabled&&a&&a.app&&a.app.backHistory?a.app.backHistory():b.history.back()},a.mobile.focusPage=function(a){var b=a.find("[autofocus]"),c=a.find(".ui-title:eq(0)");if(b.length){b.focus();return}c.length?c.focus():a.focus()};var w=!0,x,y;x=function(){if(!w)return;var b=a.mobile.urlHistory.getActive();if(b){var c=e.scrollTop();b.lastScroll=c<a.mobile.minScrollBack?a.mobile.defaultHomeScroll:c}},y=function(){setTimeout(x,100)},e.bind(a.support.pushState?"popstate":"hashchange",function(){w=!1}),e.one(a.support.pushState?"popstate":"hashchange",function(){w=!0}),e.one("pagecontainercreate",function(){a.mobile.pageContainer.bind("pagechange",function(){w=!0,e.unbind("scrollstop",y),e.bind("scrollstop",y)})}),e.bind("scrollstop",y),a.mobile._maybeDegradeTransition=a.mobile._maybeDegradeTransition||function(a){return a},a.fn.animationComplete=function(b){return a.support.cssTransitions?a(this).one("webkitAnimationEnd animationend",b):(setTimeout(b,0),a(this))},a.mobile.path=h,a.mobile.base=t,a.mobile.urlHistory=j,a.mobile.dialogHashKey=n,a.mobile.allowCrossDomainPages=!1,a.mobile.getDocumentUrl=function(b){return b?a.extend({},p):p.href},a.mobile.getDocumentBase=function(b){return b?a.extend({},q):q.href},a.mobile._bindPageRemove=function(){var b=a(this);!b.data("page").options.domCache&&b.is(":jqmData(external-page='true')")&&b.bind("pagehide.remove",function(){var b=a(this),c=new a.Event("pageremove");b.trigger(c),c.isDefaultPrevented()||b.removeWithDependents()})},a.mobile.loadPage=function(b,c){var e=a.Deferred(),f=a.extend({},a.mobile.loadPage.defaults,c),g=null,i=null,j=function(){var b=a.mobile.activePage&&D(a.mobile.activePage);return b||q.hrefNoHash},k=h.makeUrlAbsolute(b,j());f.data&&f.type==="get"&&(k=h.addSearchParams(k,f.data),f.data=d),f.data&&f.type==="post"&&(f.reloadPage=!0);var l=h.getFilePath(k),m=h.convertUrlToDataUrl(k);f.pageContainer=f.pageContainer||a.mobile.pageContainer,g=f.pageContainer.children("[data-"+a.mobile.ns+"url='"+m+"']"),g.length===0&&m&&!h.isPath(m)&&(g=f.pageContainer.children("#"+m).attr("data-"+a.mobile.ns+"url",m).jqmData("url",m));if(g.length===0)if(a.mobile.firstPage&&h.isFirstPageUrl(l))a.mobile.firstPage.parent().length&&(g=a(a.mobile.firstPage));else if(h.isEmbeddedPage(l))return e.reject(k,c),e.promise();if(g.length){if(!f.reloadPage)return B(g,f.role),e.resolve(k,c,g),e.promise();i=g}var n=f.pageContainer,o=new a.Event("pagebeforeload"),r={url:b,absUrl:k,dataUrl:m,deferred:e,options:f};n.trigger(o,r);if(o.isDefaultPrevented())return e.promise();if(f.showLoadMsg)var s=setTimeout(function(){a.mobile.showPageLoadingMsg()},f.loadMsgDelay),u=function(){clearTimeout(s),a.mobile.hidePageLoadingMsg()};return t&&t.reset(),!a.mobile.allowCrossDomainPages&&!h.isSameDomain(p,k)?e.reject(k,c):a.ajax({url:l,type:f.type,data:f.data,dataType:"html",success:function(d,j,n){var o=a("<div></div>"),p=d.match(/<title[^>]*>([^<]*)/)&&RegExp.$1,q=new RegExp("(<[^>]+\\bdata-"+a.mobile.ns+"role=[\"']?page[\"']?[^>]*>)"),s=new RegExp("\\bdata-"+a.mobile.ns+"url=[\"']?([^\"'>]*)[\"']?");q.test(d)&&RegExp.$1&&s.test(RegExp.$1)&&RegExp.$1&&(b=l=h.getFilePath(a("<div>"+RegExp.$1+"</div>").text())),t&&t.set(l),o.get(0).innerHTML=d,g=o.find(":jqmData(role='page'), :jqmData(role='dialog')").first(),g.length||(g=a("<div data-"+a.mobile.ns+"role='page'>"+d.split(/<\/?body[^>]*>/gmi)[1]+"</div>")),p&&!g.jqmData("title")&&(~p.indexOf("&")&&(p=a("<div>"+p+"</div>").text()),g.jqmData("title",p));if(!a.support.dynamicBaseTag){var v=h.get(l);g.find("[src], link[href], a[rel='external'], :jqmData(ajax='false'), a[target]").each(function(){var b=a(this).is("[href]")?"href":a(this).is("[src]")?"src":"action",c=a(this).attr(b);c=c.replace(location.protocol+"//"+location.host+location.pathname,""),/^(\w+:|#|\/)/.test(c)||a(this).attr(b,v+c)})}g.attr("data-"+a.mobile.ns+"url",h.convertUrlToDataUrl(l)).attr("data-"+a.mobile.ns+"external-page",!0).appendTo(f.pageContainer),g.one("pagecreate",a.mobile._bindPageRemove),B(g,f.role),k.indexOf("&"+a.mobile.subPageUrlKey)>-1&&(g=f.pageContainer.children("[data-"+a.mobile.ns+"url='"+m+"']")),f.showLoadMsg&&u(),r.xhr=n,r.textStatus=j,r.page=g,f.pageContainer.trigger("pageload",r),e.resolve(k,c,g,i)},error:function(b,d,g){t&&t.set(h.get()),r.xhr=b,r.textStatus=d,r.errorThrown=g;var i=new a.Event("pageloadfailed");f.pageContainer.trigger(i,r);if(i.isDefaultPrevented())return;f.showLoadMsg&&(u(),a.mobile.showPageLoadingMsg(a.mobile.pageLoadErrorMessageTheme,a.mobile.pageLoadErrorMessage,!0),setTimeout(a.mobile.hidePageLoadingMsg,1500)),e.reject(k,c)}}),e.promise()},a.mobile.loadPage.defaults={type:"get",data:d,reloadPage:!1,role:d,showLoadMsg:!1,pageContainer:d,loadMsgDelay:50},a.mobile.changePage=function(b,e){if(m){l.unshift(arguments);return}var f=a.extend({},a.mobile.changePage.defaults,e);f.pageContainer=f.pageContainer||a.mobile.pageContainer,f.fromPage=f.fromPage||a.mobile.activePage;var g=f.pageContainer,i=new a.Event("pagebeforechange"),k={toPage:b,options:f};g.trigger(i,k);if(i.isDefaultPrevented())return;b=k.toPage,m=!0;if(typeof b=="string"){a.mobile.loadPage(b,f).done(function(b,c,d,e){m=!1,c.duplicateCachedPage=e,a.mobile.changePage(d,c)}).fail(function(a,b){m=!1,u(!0),v(),f.pageContainer.trigger("pagechangefailed",k)});return}b[0]===a.mobile.firstPage[0]&&!f.dataUrl&&(f.dataUrl=p.hrefNoHash);var o=f.fromPage,q=f.dataUrl&&h.convertUrlToDataUrl(f.dataUrl)||b.jqmData("url"),r=q,s=h.getFilePath(q),t=j.getActive(),w=j.activeIndex===0,x=0,y=c.title,A=f.role==="dialog"||b.jqmData("role")==="dialog";if(o&&o[0]===b[0]&&!f.allowSamePageTransition){m=!1,g.trigger("pagechange",k),f.fromHashChange&&j.directHashChange({currentUrl:q,isBack:function(){},isForward:function(){}});return}B(b,f.role),f.fromHashChange&&j.directHashChange({currentUrl:q,isBack:function(){x=-1},isForward:function(){x=1}});try{c.activeElement&&c.activeElement.nodeName.toLowerCase()!=="body"?a(c.activeElement).blur():a("input:focus, textarea:focus, select:focus").blur()}catch(C){}var D=!1;A&&t&&(t.url.indexOf(n)>-1&&!a.mobile.activePage.is(".ui-dialog")&&(f.changeHash=!1,D=!0),q=(t.url||"")+(D?"":n),j.activeIndex===0&&q===j.initialDst&&(q+=n)),f.changeHash!==!1&&q&&(j.ignoreNextHashChange=!0,h.set(q));var E=t?b.jqmData("title")||b.children(":jqmData(role='header')").find(".ui-title").getEncodedText():y;!!E&&y===c.title&&(y=E),b.jqmData("title")||b.jqmData("title",y),f.transition=f.transition||(x&&!w?t.transition:d)||(A?a.mobile.defaultDialogTransition:a.mobile.defaultPageTransition),x||(D&&(j.activeIndex=Math.max(0,j.activeIndex-1)),j.addNew(q,f.transition,y,r,f.role)),c.title=j.getActive().title,a.mobile.activePage=b,f.reverse=f.reverse||x<0,z(b,o,f.transition,f.reverse).done(function(c,d,e,h,i){u(),f.duplicateCachedPage&&f.duplicateCachedPage.remove(),i||a.mobile.focusPage(b),v(),g.trigger("pagechange",k)})},a.mobile.changePage.defaults={transition:d,reverse:!1,changeHash:!0,fromHashChange:!1,role:d,duplicateCachedPage:d,pageContainer:d,showLoadMsg:!0,dataUrl:d,fromPage:d,allowSamePageTransition:!1},a.mobile.navreadyDeferred=a.Deferred(),a.mobile.navreadyDeferred.done(function(){a(c).delegate("form","submit",function(b){var c=a(this);if(!a.mobile.ajaxEnabled||c.is(":jqmData(ajax='false')")||!c.jqmHijackable().length)return;var d=c.attr("method"),e=c.attr("target"),f=c.attr("action");f||(f=D(c),f===q.hrefNoHash&&(f=p.hrefNoSearch)),f=h.makeUrlAbsolute(f,D(c));if(h.isExternal(f)&&!h.isPermittedCrossDomainRequest(p,f)||e)return;a.mobile.changePage(f,{type:d&&d.length&&d.toLowerCase()||"get",data:c.serialize(),transition:c.jqmData("transition"),reverse:c.jqmData("direction")==="reverse",reloadPage:!0}),b.preventDefault()}),a(c).bind("vclick",function(b){if(b.which>1||!a.mobile.linkBindingEnabled)return;var c=C(b.target);if(!a(c).jqmHijackable().length)return;c&&h.parseUrl(c.getAttribute("href")||"#").hash!=="#"&&(u(!0),i=a(c).closest(".ui-btn").not(".ui-disabled"),i.addClass(a.mobile.activeBtnClass))}),a(c).bind("click",function(c){if(!a.mobile.linkBindingEnabled)return;var e=C(c.target),f=a(e),g;if(!e||c.which>1||!f.jqmHijackable().length)return;g=function(){b.setTimeout(function(){u(!0)},200)};if(f.is(":jqmData(rel='back')"))return a.mobile.back(),!1;var i=D(f),j=h.makeUrlAbsolute(f.attr("href")||"#",i);if(!a.mobile.ajaxEnabled&&!h.isEmbeddedPage(j)){g();return}if(j.search("#")!==-1){j=j.replace(/[^#]*#/,"");if(!j){c.preventDefault();return}h.isPath(j)?j=h.makeUrlAbsolute(j,i):j=h.makeUrlAbsolute("#"+j,p.hrefNoHash)}var k=f.is("[rel='external']")||f.is(":jqmData(ajax='false')")||f.is("[target]"),l=k||h.isExternal(j)&&!h.isPermittedCrossDomainRequest(p,j);if(l){g();return}var m=f.jqmData("transition"),n=f.jqmData("direction")==="reverse"||f.jqmData("back"),o=f.attr("data-"+a.mobile.ns+"rel")||d;a.mobile.changePage(j,{transition:m,reverse:n,role:o,link:f}),c.preventDefault()}),a(c).delegate(".ui-page","pageshow.prefetch",function(){var b=[];a(this).find("a:jqmData(prefetch)").each(function(){var c=a(this),d=c.attr("href");d&&a.inArray(d,b)===-1&&(b.push(d),a.mobile.loadPage(d,{role:c.attr("data-"+a.mobile.ns+"rel")}))})}),a.mobile._handleHashChange=function(c){var e=h.stripHash(c),f=a.mobile.urlHistory.stack.length===0?"none":d,g=new a.Event("navigate"),i={transition:f,changeHash:!1,fromHashChange:!0};0===j.stack.length&&(j.initialDst=e),a.mobile.pageContainer.trigger(g);if(g.isDefaultPrevented())return;if(!a.mobile.hashListeningEnabled||j.ignoreNextHashChange){j.ignoreNextHashChange=!1;return}if(j.stack.length>1&&e.indexOf(n)>-1&&j.initialDst!==e){if(!a.mobile.activePage.is(".ui-dialog")){j.directHashChange({currentUrl:e,isBack:function(){a.mobile.back()},isForward:function(){b.history.forward()}});return}j.directHashChange({currentUrl:e,either:function(b){var c=a.mobile.urlHistory.getActive();e=c.pageUrl,a.extend(i,{role:c.role,transition:c.transition,reverse:b})}})}e?(e=typeof e=="string"&&!h.isPath(e)?h.makeUrlAbsolute("#"+e,q):e,e===h.makeUrlAbsolute("#"+j.initialDst,q)&&j.stack.length&&j.stack[0].url!==j.initialDst.replace(n,"")&&(e=a.mobile.firstPage),a.mobile.changePage(e,i)):a.mobile.changePage(a.mobile.firstPage,i)},e.bind("hashchange",function(b,c){a.mobile._handleHashChange(h.parseLocation().hash)}),a(c).bind("pageshow",A),a(b).bind("throttledresize",A)})}(a),function(a,b){var e={},f=e,g=a(b),h=a.mobile.path.parseLocation(),i=a.Deferred(),j=a.Deferred();a(c).ready(a.proxy(j,"resolve")),a(c).one("mobileinit",a.proxy(i,"resolve")),a.extend(e,{initialFilePath:function(){return h.pathname+h.search}(),hashChangeTimeout:200,hashChangeEnableTimer:d,initialHref:h.hrefNoHash,state:function(){return{hash:a.mobile.path.parseLocation().hash||"#"+f.initialFilePath,title:c.title,initialHref:f.initialHref}},resetUIKeys:function(b){var c=a.mobile.dialogHashKey,d="&"+a.mobile.subPageUrlKey,e=b.indexOf(c);return e>-1?b=b.slice(0,e)+"#"+b.slice(e):b.indexOf(d)>-1&&(b=b.split(d).join("#"+d)),b},nextHashChangePrevented:function(b){a.mobile.urlHistory.ignoreNextHashChange=b,f.onHashChangeDisabled=b},onHashChange:function(b){if(f.onHashChangeDisabled)return;var d,e,g=a.mobile.path.parseLocation().hash,h=a.mobile.path.isPath(g),i=h?a.mobile.path.getLocation():a.mobile.getDocumentUrl();g=h?g.replace("#",""):g,e=f.state(),d=a.mobile.path.makeUrlAbsolute(g,i),h&&(d=f.resetUIKeys(d)),history.replaceState(e,c.title,d)},onPopState:function(b){var c=b.originalEvent.state,d,e,g;c&&(clearTimeout(f.hashChangeEnableTimer),f.nextHashChangePrevented(!1),a.mobile._handleHashChange(c.hash),f.nextHashChangePrevented(!0),f.hashChangeEnableTimer=setTimeout(function(){f.nextHashChangePrevented(!1)},f.hashChangeTimeout))},init:function(){g.bind("hashchange",f.onHashChange),g.bind("popstate",f.onPopState),location.hash===""&&history.replaceState(f.state(),c.title,a.mobile.path.getLocation())}}),a.when(j,i,a.mobile.navreadyDeferred).done(function(){a.mobile.pushStateEnabled&&a.support.pushState&&e.init()})}(a,this),function(a,b,c){a.mobile.transitionFallbacks.flip="fade"}(a,this),function(a,b,c){a.mobile.transitionFallbacks.flow="fade"}(a,this),function(a,b,c){a.mobile.transitionFallbacks.pop="fade"}(a,this),function(a,b,c){a.mobile.transitionHandlers.slide=a.mobile.transitionHandlers.simultaneous,a.mobile.transitionFallbacks.slide="fade"}(a,this),function(a,b,c){a.mobile.transitionFallbacks.slidedown="fade"}(a,this),function(a,b,c){a.mobile.transitionFallbacks.slidefade="fade"}(a,this),function(a,b,c){a.mobile.transitionFallbacks.slideup="fade"}(a,this),function(a,b,c){a.mobile.transitionFallbacks.turn="fade"}(a,this),function(a,b){a.mobile.page.prototype.options.degradeInputs={color:!1,date:!1,datetime:!1,"datetime-local":!1,email:!1,month:!1,number:!1,range:"number",search:"text",tel:!1,time:!1,url:!1,week:!1},a(c).bind("pagecreate create",function(b){var c=a.mobile.closestPageData(a(b.target)),d;if(!c)return;d=c.options,a(b.target).find("input").not(c.keepNativeSelector()).each(function(){var b=a(this),c=this.getAttribute("type"),e=d.degradeInputs[c]||"text";if(d.degradeInputs[c]){var f=a("<div>").html(b.clone()).html(),g=f.indexOf(" type=")>-1,h=g?/\s+type=["']?\w+['"]?/:/\/?>/,i=' type="'+e+'" data-'+a.mobile.ns+'type="'+c+'"'+(g?"":">");b.replaceWith(f.replace(h,i))}})})}(a),function(a,b,d){a.widget("mobile.dialog",a.mobile.widget,{options:{closeBtnText:"Close",overlayTheme:"a",initSelector:":jqmData(role='dialog')"},_create:function(){var b=this,c=this.element,d=a("<a href='#' data-"+a.mobile.ns+"icon='delete' data-"+a.mobile.ns+"iconpos='notext'>"+this.options.closeBtnText+"</a>"),e=a("<div/>",{role:"dialog","class":"ui-dialog-contain ui-corner-all ui-overlay-shadow"});c.addClass("ui-dialog ui-overlay-"+this.options.overlayTheme),c.wrapInner(e).children().find(":jqmData(role='header')").prepend(d).end().children(":first-child").addClass("ui-corner-top").end().children(":last-child").addClass("ui-corner-bottom"),d.bind("click",function(){b.close()}),c.bind("vclick submit",function(b){var c=a(b.target).closest(b.type==="vclick"?"a":"form"),d;c.length&&!c.jqmData("transition")&&(d=a.mobile.urlHistory.getActive()||{},c.attr("data-"+a.mobile.ns+"transition",d.transition||a.mobile.defaultDialogTransition).attr("data-"+a.mobile.ns+"direction","reverse"))}).bind("pagehide",function(b,c){a(this).find("."+a.mobile.activeBtnClass).not(".ui-slider-bg").removeClass(a.mobile.activeBtnClass)}).bind("pagebeforeshow",function(){b._isCloseable=!0,b.options.overlayTheme&&b.element.page("removeContainerBackground").page("setContainerBackground",b.options.overlayTheme)})},close:function(){var b;this._isCloseable&&(this._isCloseable=!1,a.mobile.hashListeningEnabled?a.mobile.back():(b=a.mobile.urlHistory.getPrev().url,a.mobile.path.isPath(b)||(b=a.mobile.path.makeUrlAbsolute("#"+b)),a.mobile.changePage(b,{changeHash:!1,fromHashChange:!0})))}}),a(c).delegate(a.mobile.dialog.prototype.options.initSelector,"pagecreate",function(){a.mobile.dialog.prototype.enhance(this)})}(a,this),function(a,b){a.mobile.page.prototype.options.backBtnText="Back",a.mobile.page.prototype.options.addBackBtn=!1,a.mobile.page.prototype.options.backBtnTheme=null,a.mobile.page.prototype.options.headerTheme="a",a.mobile.page.prototype.options.footerTheme="a",a.mobile.page.prototype.options.contentTheme=null,a(c).bind("pagecreate",function(b){var c=a(b.target),d=c.data("page").options,e=c.jqmData("role"),f=d.theme;a(":jqmData(role='header'), :jqmData(role='footer'), :jqmData(role='content')",c).jqmEnhanceable().each(function(){var b=a(this),g=b.jqmData("role"),h=b.jqmData("theme"),i=h||d.contentTheme||e==="dialog"&&f,j,k,l,m;b.addClass("ui-"+g);if(g==="header"||g==="footer"){var n=h||(g==="header"?d.headerTheme:d.footerTheme)||f;b.addClass("ui-bar-"+n).attr("role",g==="header"?"banner":"contentinfo"),g==="header"&&(j=b.children("a, button"),k=j.hasClass("ui-btn-left"),l=j.hasClass("ui-btn-right"),k=k||j.eq(0).not(".ui-btn-right").addClass("ui-btn-left").length,l=l||j.eq(1).addClass("ui-btn-right").length),d.addBackBtn&&g==="header"&&a(".ui-page").length>1&&c.jqmData("url")!==a.mobile.path.stripHash(location.hash)&&!k&&(m=a("<a href='javascript:void(0);' class='ui-btn-left' data-"+a.mobile.ns+"rel='back' data-"+a.mobile.ns+"icon='arrow-l'>"+d.backBtnText+"</a>").attr("data-"+a.mobile.ns+"theme",d.backBtnTheme||n).prependTo(b)),b.children("h1, h2, h3, h4, h5, h6").addClass("ui-title").attr({role:"heading","aria-level":"1"})}else g==="content"&&(i&&b.addClass("ui-body-"+i),b.attr("role","main"))})})}(a),function(a,b){a.fn.fieldcontain=function(a){return this.addClass("ui-field-contain ui-body ui-br").contents().filter(function(){return this.nodeType===3&&!/\S/.test(this.nodeValue)}).remove()},a(c).bind("pagecreate create",function(b){a(":jqmData(role='fieldcontain')",b.target).jqmEnhanceable().fieldcontain()})}(a),function(a,b){a.fn.grid=function(b){return this.each(function(){var c=a(this),d=a.extend({grid:null},b),e=c.children(),f={solo:1,a:2,b:3,c:4,d:5},g=d.grid,h;if(!g)if(e.length<=5)for(var i in f)f[i]===e.length&&(g=i);else g="a",c.addClass("ui-grid-duo");h=f[g],c.addClass("ui-grid-"+g),e.filter(":nth-child("+h+"n+1)").addClass("ui-block-a"),h>1&&e.filter(":nth-child("+h+"n+2)").addClass("ui-block-b"),h>2&&e.filter(":nth-child("+h+"n+3)").addClass("ui-block-c"),h>3&&e.filter(":nth-child("+h+"n+4)").addClass("ui-block-d"),h>4&&e.filter(":nth-child("+h+"n+5)").addClass("ui-block-e")})}}(a),function(a,b){a(c).bind("pagecreate create",function(b){a(":jqmData(role='nojs')",b.target).addClass("ui-nojs")})}(a),function(a,b){function d(a){var b;while(a){b=typeof a.className=="string"&&a.className+" ";if(b&&b.indexOf("ui-btn ")>-1&&b.indexOf("ui-disabled ")<0)break;a=a.parentNode}return a}a.fn.buttonMarkup=function(d){var f=this,g=function(b,c){j.setAttribute("data-"+a.mobile.ns+b,c),i.jqmData(b,c)};d=d&&a.type(d)==="object"?d:{};for(var h=0;h<f.length;h++){var i=f.eq(h),j=i[0],k=a.extend({},a.fn.buttonMarkup.defaults,{icon:d.icon!==b?d.icon:i.jqmData("icon"),iconpos:d.iconpos!==b?d.iconpos:i.jqmData("iconpos"),theme:d.theme!==b?d.theme:i.jqmData("theme")||a.mobile.getInheritedTheme(i,"c"),inline:d.inline!==b?d.inline:i.jqmData("inline"),shadow:d.shadow!==b?d.shadow:i.jqmData("shadow"),corners:d.corners!==b?d.corners:i.jqmData("corners"),iconshadow:d.iconshadow!==b?d.iconshadow:i.jqmData("iconshadow"),mini:d.mini!==b?d.mini:i.jqmData("mini")},d),l="ui-btn-inner",m="ui-btn-text",n,o,p,q,r,s;a.each(k,g),i.jqmData("rel")==="popup"&&i.attr("href")&&(j.setAttribute("aria-haspopup",!0),j.setAttribute("aria-owns",j.getAttribute("href"))),s=a.data(j.tagName==="INPUT"||j.tagName==="BUTTON"?j.parentNode:j,"buttonElements"),s?(j=s.outer,i=a(j),p=s.inner,q=s.text,a(s.icon).remove(),s.icon=null):(p=c.createElement(k.wrapperEls),q=c.createElement(k.wrapperEls)),r=k.icon?c.createElement("span"):null,e&&!s&&e(),k.theme||(k.theme=a.mobile.getInheritedTheme(i,"c")),n="ui-btn ui-btn-up-"+k.theme,n+=k.shadow?" ui-shadow":"",n+=k.corners?" ui-btn-corner-all":"",k.mini!==b&&(n+=k.mini===!0?" ui-mini":" ui-fullsize"),k.inline!==b&&(n+=k.inline===!0?" ui-btn-inline":" ui-btn-block"),k.icon&&(k.icon="ui-icon-"+k.icon,k.iconpos=k.iconpos||"left",o="ui-icon "+k.icon,k.iconshadow&&(o+=" ui-icon-shadow")),k.iconpos&&(n+=" ui-btn-icon-"+k.iconpos,k.iconpos==="notext"&&!i.attr("title")&&i.attr("title",i.getEncodedText())),l+=k.corners?" ui-btn-corner-all":"",k.iconpos&&k.iconpos==="notext"&&!i.attr("title")&&i.attr("title",i.getEncodedText()),s&&i.removeClass(s.bcls||""),i.removeClass("ui-link").addClass(n),p.className=l,q.className=m,s||p.appendChild(q);if(r){r.className=o;if(!s||!s.icon)r.innerHTML="&#160;",p.appendChild(r)}while(j.firstChild&&!s)q.appendChild(j.firstChild);s||j.appendChild(p),s={bcls:n,outer:j,inner:p,text:q,icon:r},a.data(j,"buttonElements",s),a.data(p,"buttonElements",s),a.data(q,"buttonElements",s),r&&a.data(r,"buttonElements",s)}return this},a.fn.buttonMarkup.defaults={corners:!0,shadow:!0,iconshadow:!0,wrapperEls:"span"};var e=function(){var b=a.mobile.buttonMarkup.hoverDelay,f,g;a(c).bind({"vmousedown vmousecancel vmouseup vmouseover vmouseout focus blur scrollstart":function(c){var e,h=a(d(c.target)),i=c.originalEvent&&/^touch/.test(c.originalEvent.type),j=c.type;if(h.length){e=h.attr("data-"+a.mobile.ns+"theme");if(j==="vmousedown")i?f=setTimeout(function(){h.removeClass("ui-btn-up-"+e).addClass("ui-btn-down-"+e)},b):h.removeClass("ui-btn-up-"+e).addClass("ui-btn-down-"+e);else if(j==="vmousecancel"||j==="vmouseup")h.removeClass("ui-btn-down-"+e).addClass("ui-btn-up-"+e);else if(j==="vmouseover"||j==="focus")i?g=setTimeout(function(){h.removeClass("ui-btn-up-"+e).addClass("ui-btn-hover-"+e)},b):h.removeClass("ui-btn-up-"+e).addClass("ui-btn-hover-"+e);else if(j==="vmouseout"||j==="blur"||j==="scrollstart")h.removeClass("ui-btn-hover-"+e+" ui-btn-down-"+e).addClass("ui-btn-up-"+e),f&&clearTimeout(f),g&&clearTimeout(g)}},"focusin focus":function(b){a(d(b.target)).addClass(a.mobile.focusClass)},"focusout blur":function(b){a(d(b.target)).removeClass(a.mobile.focusClass)}}),e=null};a(c).bind("pagecreate create",function(b){a(":jqmData(role='button'), .ui-bar > a, .ui-header > a, .ui-footer > a, .ui-bar > :jqmData(role='controlgroup') > a",b.target).jqmEnhanceable().not("button, input, .ui-btn, :jqmData(role='none'), :jqmData(role='nojs')").buttonMarkup()})}(a),function(a,b){a.widget("mobile.collapsible",a.mobile.widget,{options:{expandCueText:" click to expand contents",collapseCueText:" click to collapse contents",collapsed:!0,heading:"h1,h2,h3,h4,h5,h6,legend",theme:null,contentTheme:null,inset:!0,mini:!1,initSelector:":jqmData(role='collapsible')"},_create:function(){var c=this.element,d=this.options,e=c.addClass("ui-collapsible"),f=c.children(d.heading).first(),g=c.jqmData("collapsed-icon")||d.collapsedIcon,h=c.jqmData("expanded-icon")||d.expandedIcon,i=e.wrapInner("<div class='ui-collapsible-content'></div>").children(".ui-collapsible-content"),j=c.closest(":jqmData(role='collapsible-set')").addClass("ui-collapsible-set");f.is("legend")&&(f=a("<div role='heading'>"+f.html()+"</div>").insertBefore(f),f.next().remove()),j.length?(d.theme||(d.theme=j.jqmData("theme")||a.mobile.getInheritedTheme(j,"c")),d.contentTheme||(d.contentTheme=j.jqmData("content-theme")),d.collapsedIcon||(d.collapsedIcon=j.jqmData("collapsed-icon")),d.expandedIcon||(d.expandedIcon=j.jqmData("expanded-icon")),d.iconPos||(d.iconPos=j.jqmData("iconpos")),j.jqmData("inset")!==b?d.inset=j.jqmData("inset"):d.inset=!0,d.mini||(d.mini=j.jqmData("mini"))):d.theme||(d.theme=a.mobile.getInheritedTheme(c,"c")),!d.inset||e.addClass("ui-collapsible-inset"),i.addClass(d.contentTheme?"ui-body-"+d.contentTheme:""),g=c.jqmData("collapsed-icon")||d.collapsedIcon||"plus",h=c.jqmData("expanded-icon")||d.expandedIcon||"minus",f.insertBefore(i).addClass("ui-collapsible-heading").append("<span class='ui-collapsible-heading-status'></span>").wrapInner("<a href='#' class='ui-collapsible-heading-toggle'></a>").find("a").first().buttonMarkup({shadow:!1,corners:!1,iconpos:c.jqmData("iconpos")||d.iconPos||"left",icon:g,mini:d.mini,theme:d.theme}),!d.inset||f.find("a").first().add(".ui-btn-inner",c).addClass("ui-corner-top ui-corner-bottom"),e.bind("expand collapse",function(b){if(!b.isDefaultPrevented()){var c=a(this),k=b.type==="collapse",l=d.contentTheme;b.preventDefault(),f.toggleClass("ui-collapsible-heading-collapsed",k).find(".ui-collapsible-heading-status").text(k?d.expandCueText:d.collapseCueText).end().find(".ui-icon").toggleClass("ui-icon-"+h,!k).toggleClass("ui-icon-"+g,k||h===g).end().find("a").first().removeClass(a.mobile.activeBtnClass),c.toggleClass("ui-collapsible-collapsed",k),i.toggleClass("ui-collapsible-content-collapsed",k).attr("aria-hidden",k),l&&!!d.inset&&(!j.length||e.jqmData("collapsible-last"))&&(f.find("a").first().add(f.find(".ui-btn-inner")).toggleClass("ui-corner-bottom",k),i.toggleClass("ui-corner-bottom",!k)),i.trigger("updatelayout")}}).trigger(d.collapsed?"collapse":"expand"),f.bind("tap",function(b){f.find("a").first().addClass(a.mobile.activeBtnClass)}).bind("click",function(a){var b=f.is(".ui-collapsible-heading-collapsed")?"expand":"collapse";e.trigger(b),a.preventDefault(),a.stopPropagation()})}}),a(c).bind("pagecreate create",function(b){a.mobile.collapsible.prototype.enhanceWithin(b.target)})}(a),function(a,b){a.widget("mobile.collapsibleset",a.mobile.widget,{options:{initSelector:":jqmData(role='collapsible-set')"},_create:function(){var c=this.element.addClass("ui-collapsible-set"),d=this.options;d.theme||(d.theme=a.mobile.getInheritedTheme(c,"c")),d.contentTheme||(d.contentTheme=c.jqmData("content-theme")),c.jqmData("inset")!==b&&(d.inset=c.jqmData("inset")),d.inset=d.inset!==b?d.inset:!0,c.jqmData("collapsiblebound")||c.jqmData("collapsiblebound",!0).bind("expand collapse",function(b){var c=b.type==="collapse",e=a(b.target).closest(".ui-collapsible"),f=e.data("collapsible");e.jqmData("collapsible-last")&&!!d.inset&&(e.find(".ui-collapsible-heading").first().find("a").first().toggleClass("ui-corner-bottom",c).find(".ui-btn-inner").toggleClass("ui-corner-bottom",c),e.find(".ui-collapsible-content").toggleClass("ui-corner-bottom",!c))}).bind("expand",function(b){var c=a(b.target).closest(".ui-collapsible");c.parent().is(":jqmData(role='collapsible-set')")&&c.siblings(".ui-collapsible").trigger("collapse")})},_init:function(){var a=this.element,b=a.children(":jqmData(role='collapsible')"),c=b.filter(":jqmData(collapsed='false')");this.refresh(),c.trigger("expand")},refresh:function(){var b=this.element,c=this.options,d=b.children(":jqmData(role='collapsible')");a.mobile.collapsible.prototype.enhance(d.not(".ui-collapsible")),!c.inset||(d.each(function(){a(this).jqmRemoveData("collapsible-last").find(".ui-collapsible-heading").find("a").first().removeClass("ui-corner-top ui-corner-bottom").find(".ui-btn-inner").removeClass("ui-corner-top ui-corner-bottom")}),d.first().find("a").first().addClass("ui-corner-top").find(".ui-btn-inner").addClass("ui-corner-top"),d.last().jqmData("collapsible-last",!0).find("a").first().addClass("ui-corner-bottom").find(".ui-btn-inner").addClass("ui-corner-bottom"))}}),a(c).bind("pagecreate create",function(b){a.mobile.collapsibleset.prototype.enhanceWithin(b.target)})}(a),function(a,b){a.widget("mobile.navbar",a.mobile.widget,{options:{iconpos:"top",grid:null,initSelector:":jqmData(role='navbar')"},_create:function(){var c=this.element,d=c.find("a"),e=d.filter(":jqmData(icon)").length?this.options.iconpos:b;c.addClass("ui-navbar ui-mini").attr("role","navigation").find("ul").jqmEnhanceable().grid({grid:this.options.grid}),d.buttonMarkup({corners:!1,shadow:!1,inline:!0,iconpos:e}),c.delegate("a","vclick",function(b){a(b.target).hasClass("ui-disabled")||(d.removeClass(a.mobile.activeBtnClass),a(this).addClass(a.mobile.activeBtnClass))}),c.closest(".ui-page").bind("pagebeforeshow",function(){d.filter(".ui-state-persist").addClass(a.mobile.activeBtnClass)})}}),a(c).bind("pagecreate create",function(b){a.mobile.navbar.prototype.enhanceWithin(b.target)})}(a),function(a,b){var d={};a.widget("mobile.listview",a.mobile.widget,{options:{theme:null,countTheme:"c",headerTheme:"b",dividerTheme:"b",splitIcon:"arrow-r",splitTheme:"b",inset:!1,initSelector:":jqmData(role='listview')"},_create:function(){var a=this,b="";b+=a.options.inset?" ui-listview-inset ui-corner-all ui-shadow ":"",a.element.addClass(function(a,c){return c+" ui-listview "+b}),a.refresh(!0)},_removeCorners:function(a,b){var c="ui-corner-top ui-corner-tr ui-corner-tl",d="ui-corner-bottom ui-corner-br ui-corner-bl";a=a.add(a.find(".ui-btn-inner, .ui-li-link-alt, .ui-li-thumb")),b==="top"?a.removeClass(c):b==="bottom"?a.removeClass(d):a.removeClass(c+" "+d)},_refreshCorners:function(a){var b,c,d,e;b=this.element.children("li"),c=a||b.filter(":visible").length===0?b.not(".ui-screen-hidden"):b.filter(":visible"),b.filter(".ui-li-last").removeClass("ui-li-last"),this.options.inset?(this._removeCorners(b),d=c.first().addClass("ui-corner-top"),d.add(d.find(".ui-btn-inner").not(".ui-li-link-alt span:first-child")).addClass("ui-corner-top").end().find(".ui-li-link-alt, .ui-li-link-alt span:first-child").addClass("ui-corner-tr").end().find(".ui-li-thumb").not(".ui-li-icon").addClass("ui-corner-tl"),e=c.last().addClass("ui-corner-bottom ui-li-last"),e.add(e.find(".ui-btn-inner")).find(".ui-li-link-alt").addClass("ui-corner-br").end().find(".ui-li-thumb").not(".ui-li-icon").addClass("ui-corner-bl")):c.last().addClass("ui-li-last"),a||this.element.trigger("updatelayout")},_findFirstElementByTagName:function(a,b,c,d){var e={};e[c]=e[d]=!0;while(a){if(e[a.nodeName])return a;a=a[b]}return null},_getChildrenByTagName:function(b,c,d){var e=[],f={};f[c]=f[d]=!0,b=b.firstChild;while(b)f[b.nodeName]&&e.push(b),b=b.nextSibling;return a(e)},_addThumbClasses:function(b){var c,d,e=b.length;for(c=0;c<e;c++)d=a(this._findFirstElementByTagName(b[c].firstChild,"nextSibling","img","IMG")),d.length&&(d.addClass("ui-li-thumb"),a(this._findFirstElementByTagName(d[0].parentNode,"parentNode","li","LI")).addClass(d.is(".ui-li-icon")?"ui-li-has-icon":"ui-li-has-thumb"))},refresh:function(b){this.parentPage=this.element.closest(".ui-page"),this._createSubPages();var d=this.options,e=this.element,f=this,g=e.jqmData("dividertheme")||d.dividerTheme,h=e.jqmData("splittheme"),i=e.jqmData("spliticon"),j=this._getChildrenByTagName(e[0],"li","LI"),k=!!a.nodeName(e[0],"ol"),l=!a.support.cssPseudoElement,m=e.attr("start"),n={},o,p,q,r,s,t,u,v,w,x,y,z,A,B;k&&l&&e.find(".ui-li-dec").remove(),k&&(m||m===0?l?u=parseFloat(m):(v=parseFloat(m)-1,e.css("counter-reset","listnumbering "+v)):l&&(u=1)),d.theme||(d.theme=a.mobile.getInheritedTheme(this.element,"c"));for(var C=0,D=j.length;C<D;C++){o=j.eq(C),p="ui-li";if(b||!o.hasClass("ui-li")){q=o.jqmData("theme")||d.theme,r=this._getChildrenByTagName(o[0],"a","A");var E=o.jqmData("role")==="list-divider";r.length&&!E?(y=o.jqmData("icon"),o.buttonMarkup({wrapperEls:"div",shadow:!1,corners:!1,iconpos:"right",icon:r.length>1||y===!1?!1:y||"arrow-r",theme:q}),y!==!1&&r.length===1&&o.addClass("ui-li-has-arrow"),r.first().removeClass("ui-link").addClass("ui-link-inherit"),r.length>1&&(p+=" ui-li-has-alt",s=r.last(),t=h||s.jqmData("theme")||d.splitTheme,B=s.jqmData("icon"),s.appendTo(o).attr("title",s.getEncodedText()).addClass("ui-li-link-alt").empty().buttonMarkup({shadow:!1,corners:!1,theme:q,icon:!1,iconpos:"notext"}).find(".ui-btn-inner").append(a(c.createElement("span")).buttonMarkup({shadow:!0,corners:!0,theme:t,iconpos:"notext",icon:B||y||i||d.splitIcon})))):E?(p+=" ui-li-divider ui-bar-"+g,o.attr("role","heading"),k&&(m||m===0?l?u=parseFloat(m):(w=parseFloat(m)-1,o.css("counter-reset","listnumbering "+w)):l&&(u=1))):p+=" ui-li-static ui-btn-up-"+q}k&&l&&p.indexOf("ui-li-divider")<0&&(x=p.indexOf("ui-li-static")>0?o:o.find(".ui-link-inherit"),x.addClass("ui-li-jsnumbering").prepend("<span class='ui-li-dec'>"+u++ +". </span>")),n[p]||(n[p]=[]),n[p].push(o[0])}for(p in n)a(n[p]).addClass(p).children(".ui-btn-inner").addClass(p);e.find("h1, h2, h3, h4, h5, h6").addClass("ui-li-heading").end().find("p, dl").addClass("ui-li-desc").end().find(".ui-li-aside").each(function(){var b=a(this);b.prependTo(b.parent())}).end().find(".ui-li-count").each(function(){a(this).closest("li").addClass("ui-li-has-count")}).addClass("ui-btn-up-"+(e.jqmData("counttheme")||this.options.countTheme)+" ui-btn-corner-all"),this._addThumbClasses(j),this._addThumbClasses(e.find(".ui-link-inherit")),this._refreshCorners(b),this._trigger("afterrefresh")},_idStringEscape:function(a){return a.replace(/[^a-zA-Z0-9]/g,"-")},_createSubPages:function(){var b=this.element,c=b.closest(".ui-page"),e=c.jqmData("url"),f=e||c[0][a.expando],g=b.attr("id"),h=this.options,i="data-"+a.mobile.ns,j=this,k=c.find(":jqmData(role='footer')").jqmData("id"),l;typeof d[f]=="undefined"&&(d[f]=-1),g=g||++d[f],a(b.find("li>ul, li>ol").toArray().reverse()).each(function(c){var d=this,f=a(this),j=f.attr("id")||g+"-"+c,m=f.parent(),n=a(f.prevAll().toArray().reverse()),p=n.length?n:a("<span>"+a.trim(m.contents()[0].nodeValue)+"</span>"),q=p.first().getEncodedText(),r=(e||"")+"&"+a.mobile.subPageUrlKey+"="+j,s=f.jqmData("theme")||h.theme,t=f.jqmData("counttheme")||b.jqmData("counttheme")||h.countTheme,u,v;l=!0,u=f.detach().wrap("<div "+i+"role='page' "+i+"url='"+r+"' "+i+"theme='"+s+"' "+i+"count-theme='"+t+"'><div "+i+"role='content'></div></div>").parent().before("<div "+i+"role='header' "+i+"theme='"+h.headerTheme+"'><div class='ui-title'>"+q+"</div></div>").after(k?a("<div "+i+"role='footer' "+i+"id='"+k+"'>"):"").parent().appendTo(a.mobile.pageContainer),u.page(),v=m.find("a:first"),v.length||(v=a("<a/>").html(p||q).prependTo(m.empty())),v.attr("href","#"+r)}).listview();if(l&&c.is(":jqmData(external-page='true')")&&c.data("page").options.domCache===!1){var m=function(b,d){var f=d.nextPage,g,h=new a.Event("pageremove");d.nextPage&&(g=f.jqmData("url"),g.indexOf(e+"&"+a.mobile.subPageUrlKey)!==0&&(j.childPages().remove(),c.trigger(h),h.isDefaultPrevented()||c.removeWithDependents()))};c.unbind("pagehide.remove").bind("pagehide.remove",m)}},childPages:function(){var b=this.parentPage.jqmData("url");return a(":jqmData(url^='"+b+"&"+a.mobile.subPageUrlKey+"')")}}),a(c).bind("pagecreate create",function(b){a.mobile.listview.prototype.enhanceWithin(b.target)})}(a),function(a,b){a.mobile.listview.prototype.options.autodividers=!1,a.mobile.listview.prototype.options.autodividersSelector=function(a){var b=a.text()||null;return b?(b=b.slice(0,1).toUpperCase(),b):null},a(c).delegate("ul,ol","listviewcreate",function(){var b=a(this),d=b.data("listview");if(!d||!d.options.autodividers)return;var e=function(){b.find("li:jqmData(role='list-divider')").remove();var e=b.find("li"),f=null,g,h;for(var i=0;i<e.length;i++){g=e[i],h=d.options.autodividersSelector(a(g));if(h&&f!==h){var j=c.createElement("li");j.appendChild(c.createTextNode(h)),j.setAttribute("data-"+a.mobile.ns+"role","list-divider"),g.parentNode.insertBefore(j,g)}f=h}},f=function(){b.unbind("listviewafterrefresh",f),e(),d.refresh(),b.bind("listviewafterrefresh",f)};f()})}(a),function(a,b){a.widget("mobile.checkboxradio",a.mobile.widget,{options:{theme:null,initSelector:"input[type='checkbox'],input[type='radio']"},_create:function(){var d=this,e=this.element,f=function(a,b){return a.jqmData(b)||a.closest("form, fieldset").jqmData(b)},g=a(e).closest("label"),h=g.length?g:a(e).closest("form, fieldset, :jqmData(role='page'), :jqmData(role='dialog')").find("label").filter("[for='"+e[0].id+"']").first(),i=e[0].type,j=f(e,"mini"),k=i+"-on",l=i+"-off",m=e.parents(":jqmData(type='horizontal')").length?b:l,n=f(e,"iconpos"),o=m?"":" "+a.mobile.activeBtnClass,p="ui-"+k+o,q="ui-"+l,r="ui-icon-"+k,s="ui-icon-"+l;if(i!=="checkbox"&&i!=="radio")return;a.extend(this,{label:h,inputtype:i,checkedClass:p,uncheckedClass:q,checkedicon:r,uncheckedicon:s}),this.options.theme||(this.options.theme=a.mobile.getInheritedTheme(this.element,"c")),h.buttonMarkup({theme:this.options.theme,icon:m,shadow:!1,mini:j,iconpos:n});var t=c.createElement("div");t.className="ui-"+i,e.add(h).wrapAll(t),h.bind({vmouseover:function(b){a(this).parent().is(".ui-disabled")&&b.stopPropagation()},vclick:function(a){if(e.is(":disabled")){a.preventDefault();return}return d._cacheVals(),e.prop("checked",i==="radio"&&!0||!e.prop("checked")),e.triggerHandler("click"),d._getInputSet().not(e).prop("checked",!1),d._updateAll(),!1}}),e.bind({vmousedown:function(){d._cacheVals()},vclick:function(){var b=a(this);b.is(":checked")?(b.prop("checked",!0),d._getInputSet().not(b).prop("checked",!1)):b.prop("checked",!1),d._updateAll()},focus:function(){h.addClass(a.mobile.focusClass)},blur:function(){h.removeClass(a.mobile.focusClass)}}),this.refresh()},_cacheVals:function(){this._getInputSet().each(function(){a(this).jqmData("cacheVal",this.checked)})},_getInputSet:function(){return this.inputtype==="checkbox"?this.element:this.element.closest("form, fieldset, :jqmData(role='page'), :jqmData(role='dialog')").find("input[name='"+this.element[0].name+"'][type='"+this.inputtype+"']")},_updateAll:function(){var b=this;this._getInputSet().each(function(){var c=a(this);(this.checked||b.inputtype==="checkbox")&&c.trigger("change")}).checkboxradio("refresh")},refresh:function(){var a=this.element[0],b=this.label,c=b.find(".ui-icon");a.checked?(b.addClass(this.checkedClass).removeClass(this.uncheckedClass),c.addClass(this.checkedicon).removeClass(this.uncheckedicon)):(b.removeClass(this.checkedClass).addClass(this.uncheckedClass),c.removeClass(this.checkedicon).addClass(this.uncheckedicon)),a.disabled?this.disable():this.enable()},disable:function(){this.element.prop("disabled",!0).parent().addClass("ui-disabled")},enable:function(){this.element.prop("disabled",!1).parent().removeClass("ui-disabled")}}),a(c).bind("pagecreate create",function(b){a.mobile.checkboxradio.prototype.enhanceWithin(b.target,!0)})}(a),function(a,b){a.widget("mobile.button",a.mobile.widget,{options:{theme:null,icon:null,iconpos:null,corners:!0,shadow:!0,iconshadow:!0,initSelector:"button, [type='button'], [type='submit'], [type='reset']"},_create:function(){var d=this.element,e,f=this.options,g,h,i=f.inline||d.jqmData("inline"),j=f.mini||d.jqmData("mini"),k="",l;if(d[0].tagName==="A"){d.hasClass("ui-btn")||d.buttonMarkup();return}this.options.theme||(this.options.theme=a.mobile.getInheritedTheme(this.element,"c")),!~d[0].className.indexOf("ui-btn-left")||(k="ui-btn-left"),!~d[0].className.indexOf("ui-btn-right")||(k="ui-btn-right");if(d.attr("type")==="submit"||d.attr("type")==="reset")k?k+=" ui-submit":k="ui-submit";a("label[for='"+d.attr("id")+"']").addClass("ui-submit"),this.button=a("<div></div>")[d.html()?"html":"text"](d.html()||d.val()).insertBefore(d).buttonMarkup({theme:f.theme,icon:f.icon,iconpos:f.iconpos,inline:i,corners:f.corners,shadow:f.shadow,iconshadow:f.iconshadow,mini:j}).addClass(k).append(d.addClass("ui-btn-hidden")),e=this.button,g=d.attr("type"),h=d.attr("name"),g!=="button"&&g!=="reset"&&h&&d.bind("vclick",function(){l===b&&(l=a("<input>",{type:"hidden",name:d.attr("name"),value:d.attr("value")}).insertBefore(d),a(c).one("submit",function(){l.remove(),l=b}))}),d.bind({focus:function(){e.addClass(a.mobile.focusClass)},blur:function(){e.removeClass(a.mobile.focusClass)}}),this.refresh()},enable:function(){return this.element.attr("disabled",!1),this.button.removeClass("ui-disabled").attr("aria-disabled",!1),this._setOption("disabled",!1)},disable:function(){return this.element.attr("disabled",!0),this.button.addClass("ui-disabled").attr("aria-disabled",!0),this._setOption("disabled",!0)},refresh:function(){var b=this.element;b.prop("disabled")?this.disable():this.enable(),a(this.button.data("buttonElements").text)[b.html()?"html":"text"](b.html()||b.val())}}),a(c).bind("pagecreate create",function(b){a.mobile.button.prototype.enhanceWithin(b.target,!0)})}(a),function(a,b){a.fn.controlgroup=function(b){function c(a,b){a.removeClass("ui-btn-corner-all ui-corner-top ui-corner-bottom ui-corner-left ui-corner-right ui-controlgroup-last ui-shadow").eq(0).addClass(b[0]).end().last().addClass(b[1]).addClass("ui-controlgroup-last")}return this.each(function(){var d=a(this),e=a.extend({direction:d.jqmData("type")||"vertical",shadow:!1,excludeInvisible:!0,mini:d.jqmData("mini")},b),f=d.children("legend"),g=d.children(".ui-controlgroup-label"),h=d.children(".ui-controlgroup-controls"),i=e.direction==="horizontal"?["ui-corner-left","ui-corner-right"]:["ui-corner-top","ui-corner-bottom"],j=d.find("input").first().attr("type");h.length&&h.contents().unwrap(),d.wrapInner("<div class='ui-controlgroup-controls'></div>"),f.length?(a("<div role='heading' class='ui-controlgroup-label'>"+f.html()+"</div>").insertBefore(d.children(0)),f.remove()):g.length&&d.prepend(g),d.addClass("ui-corner-all ui-controlgroup ui-controlgroup-"+e.direction),c(d.find(".ui-btn"+(e.excludeInvisible?":visible":"")).not(".ui-slider-handle"),i),c(d.find(".ui-btn-inner"),i),e.shadow&&d.addClass("ui-shadow"),e.mini&&d.addClass("ui-mini")})}}(a),function(a,b){a(c).bind("pagecreate create",function(b){a(b.target).find("a").jqmEnhanceable().not(".ui-btn, .ui-link-inherit, :jqmData(role='none'), :jqmData(role='nojs')").addClass("ui-link")})}(a),function(a,d){function e(a,b,c,d){var e=d;return a<b?e=c+(a-b)/2:e=Math.min(Math.max(c,d-b/2),c+a-b),e}function f(){var c=a(b);return{x:c.scrollLeft(),y:c.scrollTop(),cx:b.innerWidth||c.width(),cy:b.innerHeight||c.height()}}a.widget("mobile.popup",a.mobile.widget,{options:{theme:null,overlayTheme:null,shadow:!0,corners:!0,transition:"none",positionTo:"origin",tolerance:null,initSelector:":jqmData(role='popup')",closeLinkSelector:"a:jqmData(rel='back')",closeLinkEvents:"click.popup",navigateEvents:"navigate.popup",closeEvents:"navigate.popup pagebeforechange.popup",history:!a.mobile.browser.ie},_eatEventAndClose:function(a){return a.preventDefault(),a.stopImmediatePropagation(),this.close(),!1},_resizeScreen:function(){var a=this._ui.container.outerHeight(!0);this._ui.screen.removeAttr("style"),a>this._ui.screen.height()&&this._ui.screen.height(a)},_handleWindowKeyUp:function(b){if(this._isOpen&&b.keyCode===a.mobile.keyCode.ESCAPE)return this._eatEventAndClose(b)},_maybeRefreshTimeout:function(){var b=f();if(this._resizeData){if(b.x===this._resizeData.winCoords.x&&b.y===this._resizeData.winCoords.y&&b.cx===this._resizeData.winCoords.cx&&b.cy===this._resizeData.winCoords.cy)return!1;clearTimeout(this._resizeData.timeoutId)}return this._resizeData={timeoutId:setTimeout(a.proxy(this,"_resizeTimeout"),200),winCoords:b},!0},_resizeTimeout:function(){this._maybeRefreshTimeout()||(this._trigger("beforeposition"),this._ui.container.removeClass("ui-selectmenu-hidden").offset(this._placementCoords(this._desiredCoords(d,d,"window"))),this._resizeScreen(),this._resizeData=null,this._orientationchangeInProgress=!1)},_handleWindowResize:function(a){this._isOpen&&this._maybeRefreshTimeout()},_handleWindowOrientationchange:function(a){this._orientationchangeInProgress||(this._ui.container.addClass("ui-selectmenu-hidden").removeAttr("style"),this._orientationchangeInProgress=!0)},_create:function(){var c={screen:a("<div class='ui-screen-hidden ui-popup-screen'></div>"),placeholder:a("<div style='display: none;'><!-- placeholder --></div>"),container:a("<div class='ui-popup-container ui-selectmenu-hidden'></div>")},e=this.element.closest(".ui-page"),f=this.element.attr("id"),g=this;this.options.history=this.options.history&&a.mobile.ajaxEnabled&&a.mobile.hashListeningEnabled,e.length===0&&(e=a("body")),this.options.container=this.options.container||a.mobile.pageContainer,e.append(c.screen),c.container.insertAfter(c.screen),c.placeholder.insertAfter(this.element),f&&(c.screen.attr("id",f+"-screen"),c.container.attr("id",f+"-popup"),c.placeholder.html("<!-- placeholder for "+f+" -->")),c.container.append(this.element),this.element.addClass("ui-popup"),a.extend(this,{_page:e,_ui:c,_fallbackTransition:"",_currentTransition:!1,_prereqs:null,_isOpen:!1,_tolerance:null,_resizeData:null,_orientationchangeInProgress:!1,_globalHandlers:[{src:a(b),handler:{orientationchange:a.proxy(this,"_handleWindowOrientationchange"),resize:a.proxy(this,"_handleWindowResize"),keyup:a.proxy(this,"_handleWindowKeyUp")}}]}),a.each(this.options,function(a,b){g.options[a]=d,g._setOption(a,b,!0)}),c.screen.bind("vclick",a.proxy(this,"_eatEventAndClose")),a.each(this._globalHandlers,function(a,b){b.src.bind(b.handler)})},_applyTheme:function(a,b,c){var d=(a.attr("class")||"").split(" "),e=!0,f=null,g,h=String(b);while(d.length>0){f=d.pop(),g=(new RegExp("^ui-"+c+"-([a-z])$")).exec(f);if(g&&g.length>1){f=g[1];break}f=null}b!==f&&(a.removeClass("ui-"+c+"-"+f),b!==null&&b!=="none"&&a.addClass("ui-"+c+"-"+h))},_setTheme:function(a){this._applyTheme(this.element,a,"body")},_setOverlayTheme:function(a){this._applyTheme(this._ui.screen,a,"overlay"),this._isOpen&&this._ui.screen.addClass("in")},_setShadow:function(a){this.element.toggleClass("ui-overlay-shadow",a)},_setCorners:function(a){this.element.toggleClass("ui-corner-all",a)},_applyTransition:function(b){this._ui.container.removeClass(this._fallbackTransition),b&&b!=="none"&&(this._fallbackTransition=a.mobile._maybeDegradeTransition(b),this._ui.container.addClass(this._fallbackTransition))},_setTransition:function(a){this._currentTransition||this._applyTransition(a)},_setTolerance:function(b){var c={t:30,r:15,b:30,l:15};if(b){var d=String(b).split(",");a.each(d,function(a,b){d[a]=parseInt(b,10)});switch(d.length){case 1:isNaN(d[0])||(c.t=c.r=c.b=c.l=d[0]);break;case 2:isNaN(d[0])||(c.t=c.b=d[0]),isNaN(d[1])||(c.l=c.r=d[1]);break;case 4:isNaN(d[0])||(c.t=d[0]),isNaN(d[1])||(c.r=d[1]),isNaN(d[2])||(c.b=d[2]),isNaN(d[3])||(c.l=d[3]);break;default:}}this._tolerance=c},_setOption:function(b,c){var e,f="_set"+b.charAt(0).toUpperCase()+b.slice(1);this[f]!==d&&this[f](c),e=["initSelector","closeLinkSelector","closeLinkEvents","navigateEvents","closeEvents","history","container"],a.mobile.widget.prototype._setOption.apply(this,arguments),a.inArray(b,e)===-1&&this.element.attr("data-"+(a.mobile.ns||"")+b.replace(/([A-Z])/,"-$1").toLowerCase(),c)},_placementCoords:function(a){var b=f(),d={x:this._tolerance.l,y:b.y+this._tolerance.t,cx:b.cx-this._tolerance.l-this._tolerance.r,cy:b.cy-this._tolerance.t-this._tolerance.b},g,h;this._ui.container.css("max-width",d.cx),g={cx:this._ui.container.outerWidth(!0),cy:this._ui.container.outerHeight(!0)},h={x:e(d.cx,g.cx,d.x,a.x),y:e(d.cy,g.cy,d.y,a.y)},h.y=Math.max(0,h.y);var i=c.documentElement,j=c.body,k=Math.max(i.clientHeight,j.scrollHeight,j.offsetHeight,i.scrollHeight,i.offsetHeight);return h.y-=Math.min(h.y,Math.max(0,h.y+g.cy-k)),{left:h.x,top:h.y}},_createPrereqs:function(b,c,d){var e=this,f;f={screen:a.Deferred(),container:a.Deferred()},f.screen.then(function(){f===e._prereqs&&b()}),f.container.then(function(){f===e._prereqs&&c()}),a.when(f.screen,f.container).done(function(){f===e._prereqs&&(e._prereqs=null,d())}),e._prereqs=f},_animate:function(b){this._ui.screen.removeClass(b.classToRemove).addClass(b.screenClassToAdd),b.prereqs.screen.resolve(),b.transition&&b.transition!=="none"?(b.applyTransition&&this._applyTransition(b.transition),this._ui.container.animationComplete(a.proxy(b.prereqs.container,"resolve")).addClass(b.containerClassToAdd).removeClass(b.classToRemove)):b.prereqs.container.resolve()},_desiredCoords:function(b,c,d){var e=null,g,h=f();if(d&&d!=="origin")if(d==="window")b=h.cx/2+h.x,c=h.cy/2+h.y;else{try{e=a(d)}catch(i){e=null}e&&(e.filter(":visible"),e.length===0&&(e=null))}e&&(g=e.offset(),b=g.left+e.outerWidth()/2,c=g.top+e.outerHeight()/2);if(a.type(b)!=="number"||isNaN(b))b=h.cx/2+h.x;if(a.type(c)!=="number"||isNaN(c))c=h.cy/2+h.y;return{x:b,y:c}},_openPrereqsComplete:function(){var a=this;a._ui.container.addClass("ui-popup-active"),a._isOpen=!0,a._resizeScreen(),setTimeout(function(){a._ui.container.attr("tabindex","0").focus(),a._trigger("afteropen")})},_open:function(c){var d,e,f=function(){var a=b,c=navigator.userAgent,d=c.match(/AppleWebKit\/([0-9\.]+)/),e=!!d&&d[1],f=c.match(/Android (\d+(?:\.\d+))/),g=!!f&&f[1],h=c.indexOf("Chrome")>-1;return f!==null&&g==="4.0"&&e&&e>534.13&&!h?!0:!1}();c=c||{},e=c.transition||this.options.transition,this._trigger("beforeposition"),d=this._placementCoords(this._desiredCoords(c.x,c.y,c.positionTo||this.options.positionTo||"origin")),this._createPrereqs(a.noop,a.noop,a.proxy(this,"_openPrereqsComplete")),e?(this._currentTransition=e,this._applyTransition(e)):e=this.options.transition,this.options.theme||this._setTheme(this._page.jqmData("theme")||a.mobile.getInheritedTheme(this._page,"c")),this._ui.screen.removeClass("ui-screen-hidden"),this._ui.container.removeClass("ui-selectmenu-hidden").offset(d),this.options.overlayTheme&&f&&this.element.closest(".ui-page").addClass("ui-popup-open"),this._animate({additionalCondition:!0,transition:e,classToRemove:"",screenClassToAdd:"in",containerClassToAdd:"in",applyTransition:!1,prereqs:this._prereqs})},_closePrereqScreen:function(){this._ui.screen.removeClass("out").addClass("ui-screen-hidden")},_closePrereqContainer:function(){this._ui.container.removeClass("reverse out").addClass("ui-selectmenu-hidden").removeAttr("style")},_closePrereqsDone:function(){var b=this,c=b.options;b._ui.container.removeAttr("tabindex"),c.container.unbind(c.closeEvents),b.element.undelegate(c.closeLinkSelector,c.closeLinkEvents),a.mobile.popup.active=d,b._trigger("afterclose")},_close:function(){this._ui.container.removeClass("ui-popup-active"),this._page.removeClass("ui-popup-open"),this._isOpen=!1,this._createPrereqs(a.proxy(this,"_closePrereqScreen"),a.proxy(this,"_closePrereqContainer"),a.proxy(this,"_closePrereqsDone")),this._animate({additionalCondition:this._ui.screen.hasClass("in"),transition:this._currentTransition||this.options.transition,classToRemove:"in",screenClassToAdd:"out",containerClassToAdd:"reverse out",applyTransition:!0,prereqs:this._prereqs})},_destroy:function(){var b=this;b._close(),b._setTheme("none"),b.element.insertAfter(b._ui.placeholder).removeClass("ui-popup ui-overlay-shadow ui-corner-all"),b._ui.screen.remove(),b._ui.container.remove(),b._ui.placeholder.remove(),a.each(b._globalHandlers,function(b,c){a.each(c.handler,function(a,b){c.src.unbind(a,b)})})},_bindContainerClose:function(){var b=this;b.options.container.one(b.options.closeEvents,a.proxy(b._close,b))},open:function(b){var c=this,e=this.options,f,g,h,i,j,k;if(a.mobile.popup.active)return;a.mobile.popup.active=this;if(!e.history){c._open(b),c._bindContainerClose(),c.element.delegate(e.closeLinkSelector,e.closeLinkEvents,function(a){return c._close(),!1});return}g=a.mobile.dialogHashKey,h=a.mobile.activePage,i=h.is(".ui-dialog"),f=a.mobile.urlHistory.getActive().url,j=f.indexOf(g)>-1&&!i,k=a.mobile.urlHistory;if(j){c._open(b),c._bindContainerClose();return}f.indexOf(g)===-1&&!i?f=f+g:f=a.mobile.path.parseLocation().hash+g,k.activeIndex===0&&f===k.initialDst&&(f+=g),e.container.one(e.navigateEvents,function(a){a.preventDefault(),c._open(b),c._bindContainerClose()}),k.ignoreNextHashChange=i,k.addNew(f,d,d,d,"dialog"),a.mobile.path.set(f)},close:function(){if(!a.mobile.popup.active)return;this.options.history?a.mobile.back():this._close()}}),a.mobile.popup.handleLink=function(b){var c=b.closest(":jqmData(role='page')"),d=c.length===0?a("body"):c,e=a(a.mobile.path.parseUrl(b.attr("href")).hash,d[0]),f;e.data("popup")&&(f=b.offset(),e.popup("open",{x:f.left+b.outerWidth()/2,y:f.top+b.outerHeight()/2,transition:b.jqmData("transition"),positionTo:b.jqmData("position-to"),link:b})),setTimeout(function(){b.removeClass(a.mobile.activeBtnClass)},300)},a(c).bind("pagebeforechange",function(b,c){c.options.role==="popup"&&(a.mobile.popup.handleLink(c.options.link),b.preventDefault())}),a(c).bind("pagecreate create",function(b){a.mobile.popup.prototype.enhanceWithin(b.target,!0)})}(a),function(a){var b=a("meta[name=viewport]"),c=b.attr("content"),d=c+",maximum-scale=1, user-scalable=no",e=c+",maximum-scale=10, user-scalable=yes",f=/(user-scalable[\s]*=[\s]*no)|(maximum-scale[\s]*=[\s]*1)[$,\s]/.test(c);a.mobile.zoom=a.extend({},{enabled:!f,locked:!1,disable:function(c){!f&&!a.mobile.zoom.locked&&(b.attr("content",d),a.mobile.zoom.enabled=!1,a.mobile.zoom.locked=c||!1)},enable:function(c){!f&&(!a.mobile.zoom.locked||c===!0)&&(b.attr("content",e),a.mobile.zoom.enabled=!0,a.mobile.zoom.locked=!1)},restore:function(){f||(b.attr("content",c),a.mobile.zoom.enabled=!0)}})}(a),function(a,d){a.widget("mobile.textinput",a.mobile.widget,{options:{theme:null,preventFocusZoom:/iPhone|iPad|iPod/.test(navigator.platform)&&navigator.userAgent.indexOf("AppleWebKit")>-1,initSelector:"input[type='text'], input[type='search'], :jqmData(type='search'), input[type='number'], :jqmData(type='number'), input[type='password'], input[type='email'], input[type='url'], input[type='tel'], textarea, input[type='time'], input[type='date'], input[type='month'], input[type='week'], input[type='datetime'], input[type='datetime-local'], input[type='color'], input:not([type])",clearSearchButtonText:"clear text",disabled:!1},_create:function(){function m(){setTimeout(function(){l.toggleClass("ui-input-clear-hidden",!e.val())},0)}var d=this,e=this.element,f=this.options,g=f.theme||a.mobile.getInheritedTheme(this.element,"c"),h=" ui-body-"+g,i=e.jqmData("mini")===!0,j=i?" ui-mini":"",k,l;a("label[for='"+e.attr("id")+"']").addClass("ui-input-text"),k=e.addClass("ui-input-text ui-body-"+g),typeof e[0].autocorrect!="undefined"&&!a.support.touchOverflow&&(e[0].setAttribute("autocorrect","off"),e[0].setAttribute("autocomplete","off")),e.is("[type='search'],:jqmData(type='search')")?(k=e.wrap("<div class='ui-input-search ui-shadow-inset ui-btn-corner-all ui-btn-shadow ui-icon-searchfield"+h+j+"'></div>").parent(),l=a("<a href='#' class='ui-input-clear' title='"+f.clearSearchButtonText+"'>"+f.clearSearchButtonText+"</a>").bind("click",function(a){e.val("").focus().trigger("change"),l.addClass("ui-input-clear-hidden"),a.preventDefault()}).appendTo(k).buttonMarkup({icon:"delete",iconpos:"notext",corners:!0,shadow:!0,mini:i}),m(),e.bind("paste cut keyup focus change blur",m)):e.addClass("ui-corner-all ui-shadow-inset"+h+j),e.focus(function(){k.addClass(a.mobile.focusClass)}).blur(function(){k.removeClass(a.mobile.focusClass)}).bind("focus",function(){f.preventFocusZoom&&a.mobile.zoom.disable(!0)}).bind("blur",function(){f.preventFocusZoom&&a.mobile.zoom.enable(!0)});if(e.is("textarea")){var n=15,o=100,p;this._keyup=function(){var a=e[0].scrollHeight,b=e[0].clientHeight;b<a&&e.height(a+n)},e.keyup(function(){clearTimeout(p),p=setTimeout(d._keyup,o)}),this._on(a(c),{pagechange:"_keyup"}),a.trim(e.val())&&this._on(a(b),{load:"_keyup"})}e.attr("disabled")&&this.disable()},disable:function(){var a;return this.element.attr("disabled",!0).is("[type='search'], :jqmData(type='search')")?a=this.element.parent():a=this.element,a.addClass("ui-disabled"),this._setOption("disabled",!0)},enable:function(){var a;return this.element.attr("disabled",!1).is("[type='search'], :jqmData(type='search')")?a=this.element.parent():a=this.element,a.removeClass("ui-disabled"),this._setOption("disabled",!1)}}),a(c).bind("pagecreate create",function(b){a.mobile.textinput.prototype.enhanceWithin(b.target,!0)})}(a),function(a,b){a.mobile.listview.prototype.options.filter=!1,a.mobile.listview.prototype.options.filterPlaceholder="Filter items...",a.mobile.listview.prototype.options.filterTheme="c";var d=function(a,b,c){return a.toString().toLowerCase().indexOf(b)===-1};a.mobile.listview.prototype.options.filterCallback=d,a(c).delegate(":jqmData(role='listview')","listviewcreate",function(){var b=a(this),c=b.data("listview");if(!c.options.filter)return;var e=a("<form>",{"class":"ui-listview-filter ui-bar-"+c.options.filterTheme,role:"search"}),f=a("<input>",{placeholder:c.options.filterPlaceholder}).attr("data-"+a.mobile.ns+"type","search").jqmData("lastval","").bind("keyup change",function(){var e=a(this),f=this.value.toLowerCase(),g=null,h=e.jqmData("lastval")+"",i=!1,j="",k,l=c.options.filterCallback!==d;c._trigger("beforefilter","beforefilter",{input:this}),e.jqmData("lastval",f),l||f.length<h.length||f.indexOf(h)!==0?g=b.children():g=b.children(":not(.ui-screen-hidden)");if(f){for(var m=g.length-1;m>=0;m--)k=a(g[m]),j=k.jqmData("filtertext")||k.text(),k.is("li:jqmData(role=list-divider)")?(k.toggleClass("ui-filter-hidequeue",!i),i=!1):c.options.filterCallback(j,f,k)?k.toggleClass("ui-filter-hidequeue",!0):i=!0;g.filter(":not(.ui-filter-hidequeue)").toggleClass("ui-screen-hidden",!1),g.filter(".ui-filter-hidequeue").toggleClass("ui-screen-hidden",!0).toggleClass("ui-filter-hidequeue",!1)}else g.toggleClass("ui-screen-hidden",!1);c._refreshCorners()}).appendTo(e).textinput();c.options.inset&&e.addClass("ui-listview-filter-inset"),e.bind("submit",function(){return!1}).insertBefore(b)})}(a),function(a,d){a.widget("mobile.slider",a.mobile.widget,{widgetEventPrefix:"slide",options:{theme:null,trackTheme:null,disabled:!1,initSelector:"input[type='range'], :jqmData(type='range'), :jqmData(role='slider')",mini:!1},_create:function(){var e=this,f=this.element,g=a.mobile.getInheritedTheme(f,"c"),h=this.options.theme||g,i=this.options.trackTheme||g,j=f[0].nodeName.toLowerCase(),k=j==="select"?"ui-slider-switch":"",l=f.attr("id"),m=a("[for='"+l+"']"),n=m.attr("id")||l+"-label",o=m.attr("id",n),p=function(){return j==="input"?parseFloat(f.val()):f[0].selectedIndex},q=j==="input"?parseFloat(f.attr("min")):0,r=j==="input"?parseFloat(f.attr("max")):f.find("option").length-1,s=b.parseFloat(f.attr("step")||1),t=this.options.inline||f.jqmData("inline")===!0?" ui-slider-inline":"",u=this.options.mini||f.jqmData("mini")?" ui-slider-mini":"",v=c.createElement("a"),w=a(v),x=c.createElement("div"),y=a(x),z=f.jqmData("highlight")&&j!=="select"?function(){var b=c.createElement("div");return b.className="ui-slider-bg "+a.mobile.activeBtnClass+" ui-btn-corner-all",a(b).prependTo(y)}():!1,A;this._type=j,v.setAttribute("href","#"),x.setAttribute("role","application"),x.className=["ui-slider ",k," ui-btn-down-",i," ui-btn-corner-all",t,u].join(""),v.className="ui-slider-handle",x.appendChild(v),w.buttonMarkup({corners:!0,theme:h,shadow:!0}).attr({role:"slider","aria-valuemin":q,"aria-valuemax":r,"aria-valuenow":p(),"aria-valuetext":p(),title:p(),"aria-labelledby":n}),a.extend(this,{slider:y,handle:w,valuebg:z,dragging:!1,beforeStart:null,userModified:!1,mouseMoved:!1});if(j==="select"){var B=c.createElement("div");B.className="ui-slider-inneroffset";for(var C=0,D=x.childNodes.length;C<D;C++)B.appendChild(x.childNodes[C]);x.appendChild(B),w.addClass("ui-slider-handle-snapping"),A=f.find("option");for(var E=0,F=A.length;E<F;E++){var G=E?"a":"b",H=E?" "+a.mobile.activeBtnClass:" ui-btn-down-"+i,I=c.createElement("div"),J=c.createElement("span");J.className=["ui-slider-label ui-slider-label-",G,H," ui-btn-corner-all"].join(""),J.setAttribute("role","img"),J.appendChild(c.createTextNode(A[E].innerHTML)),a(J).prependTo(y)}e._labels=a(".ui-slider-label",y)}o.addClass("ui-slider"),f.addClass(j==="input"?"ui-slider-input":"ui-slider-switch").change(function(){e.mouseMoved||e.refresh(p(),!0)}).keyup(function(){e.refresh(p(),!0,!0)}).blur(function(){e.refresh(p(),!0)}),this._preventDocumentDrag=function(a){if(e.dragging&&!e.options.disabled)return e.mouseMoved=!0,j==="select"&&w.removeClass("ui-slider-handle-snapping"),e.refresh(a),e.userModified=e.beforeStart!==f[0].selectedIndex,!1},this._on(a(c),{vmousemove:this._preventDocumentDrag}),f.bind("vmouseup",a.proxy(e._checkedRefresh,e)),y.bind("vmousedown",function(a){return e.options.disabled?!1:(e.dragging=!0,e.userModified=!1,e.mouseMoved=!1,j==="select"&&(e.beforeStart=f[0].selectedIndex),e.refresh(a),e._trigger("start"),!1)}).bind("vclick",!1),this._sliderMouseUp=function(){if(e.dragging)return e.dragging=!1,j==="select"&&(w.addClass("ui-slider-handle-snapping"),e.mouseMoved?e.userModified?e.refresh(e.beforeStart===0?1:0):e.refresh(e.beforeStart):e.refresh(e.beforeStart===0?1:0)),e.mouseMoved=!1,e._trigger("stop"),!1},this._on(y.add(c),{vmouseup:this._sliderMouseUp}),y.insertAfter(f),j==="select"&&this.handle.bind({focus:function(){y.addClass(a.mobile.focusClass)},blur:function(){y.removeClass(a.mobile.focusClass)}}),this.handle.bind({vmousedown:function(){a(this).focus()},vclick:!1,keydown:function(b){var c=p();if(e.options.disabled)return;switch(b.keyCode){case a.mobile.keyCode.HOME:case a.mobile.keyCode.END:case a.mobile.keyCode.PAGE_UP:case a.mobile.keyCode.PAGE_DOWN:case a.mobile.keyCode.UP:case a.mobile.keyCode.RIGHT:case a.mobile.keyCode.DOWN:case a.mobile.keyCode.LEFT:b.preventDefault(),e._keySliding||(e._keySliding=!0,a(this).addClass("ui-state-active"))}switch(b.keyCode){case a.mobile.keyCode.HOME:e.refresh(q);break;case a.mobile.keyCode.END:e.refresh(r);break;case a.mobile.keyCode.PAGE_UP:case a.mobile.keyCode.UP:case a.mobile.keyCode.RIGHT:e.refresh(c+s);break;case a.mobile.keyCode.PAGE_DOWN:case a.mobile.keyCode.DOWN:case a.mobile.keyCode.LEFT:e.refresh(c-s)}},keyup:function(b){e._keySliding&&(e._keySliding=!1,a(this).removeClass("ui-state-active"))}}),this.refresh(d,d,!0)},_checkedRefresh:function(){this.value!=this._value()&&this.refresh(this._value())},_value:function(){return this._type==="input"?parseFloat(this.element.val()):this.element[0].selectedIndex},refresh:function(b,c,d){(this.options.disabled||this.element.attr("disabled"))&&this.disable(),this.value=this._value();var e=this.element,f,g=e[0].nodeName.toLowerCase(),h=g==="input"?parseFloat(e.attr("min")):0,i=g==="input"?parseFloat(e.attr("max")):e.find("option").length-1,j=g==="input"&&parseFloat(e.attr("step"))>0?parseFloat(e.attr("step")):1;if(typeof b=="object"){var k=b,l=8;if(!this.dragging||k.pageX<this.slider.offset().left-l||k.pageX>this.slider.offset().left+this.slider.width()+l)return;f=Math.round((k.pageX-this.slider.offset().left)/this.slider.width()*100)}else b==null&&(b=g==="input"?parseFloat(e.val()||0):e[0].selectedIndex),f=(parseFloat(b)-h)/(i-h)*100;if(isNaN(f))return;f<0&&(f=0),f>100&&(f=100);var m=f/100*(i-h)+h,n=(m-h)%j,o=m-n;Math.abs(n)*2>=j&&(o+=n>0?j:-j),m=parseFloat(o.toFixed(5)),m<h&&(m=h),m>i&&(m=i),this.handle.css("left",f+"%"),this.handle.attr({"aria-valuenow":g==="input"?m:e.find("option").eq(m).attr("value"),"aria-valuetext":g==="input"?m:e.find("option").eq(m).getEncodedText(),title:g==="input"?m:e.find("option").eq(m).getEncodedText()}),this.valuebg&&this.valuebg.css("width",f+"%");if(this._labels){var p=this.handle.width()/this.slider.width()*100,q=f&&p+(100-p)*f/100,r=f===100?0:Math.min(p+100-q,100);this._labels.each(function(){var b=a(this).is(".ui-slider-label-a");a(this).width((b?q:r)+"%")})}if(!d){var s=!1;g==="input"?(s=e.val()!==m,e.val(m)):(s=e[0].selectedIndex!==m,e[0].selectedIndex=m),!c&&s&&e.trigger("change")}},enable:function(){return this.element.attr("disabled",!1),this.slider.removeClass("ui-disabled").attr("aria-disabled",!1),this._setOption("disabled",!1)},disable:function(){return this.element.attr("disabled",!0),this.slider.addClass("ui-disabled").attr("aria-disabled",!0),this._setOption("disabled",!0)}}),a(c).bind("pagecreate create",function(b){a.mobile.slider.prototype.enhanceWithin(b.target,!0)})}(a),function(a,d){a.widget("mobile.selectmenu",a.mobile.widget,{options:{theme:null,disabled:!1,icon:"arrow-d",iconpos:"right",inline:!1,corners:!0,shadow:!0,iconshadow:!0,overlayTheme:"a",hidePlaceholderMenuItems:!0,closeText:"Close",nativeMenu:!0,preventFocusZoom:/iPhone|iPad|iPod/.test(navigator.platform)&&navigator.userAgent.indexOf("AppleWebKit")>-1,initSelector:"select:not( :jqmData(role='slider') )",mini:!1},_button:function(){return a("<div/>")},_setDisabled:function(a){return this.element.attr("disabled",a),this.button.attr("aria-disabled",a),this._setOption("disabled",a)},_focusButton:function(){var a=this;setTimeout(function(){a.button.focus()},40)},_selectOptions:function(){return this.select.find("option")},_preExtension:function(){var b="";!~this.element[0].className.indexOf("ui-btn-left")||(b=" ui-btn-left"),!~this.element[0].className.indexOf("ui-btn-right")||(b=" ui-btn-right"),this.select=this.element.wrap("<div class='ui-select"+b+"'>"),this.selectID=this.select.attr("id"),this.label=a("label[for='"+this.selectID+"']").addClass("ui-select"),this.isMultiple=this.select[0].multiple,this.options.theme||(this.options.theme=a.mobile.getInheritedTheme(this.select,"c"))},_create:function(){this._preExtension(),this._trigger("beforeCreate"),this.button=this._button();var c=this,d=this.options,e=d.inline||this.select.jqmData("inline"),f=d.mini||this.select.jqmData("mini"),g=d.icon?d.iconpos||this.select.jqmData("iconpos"):!1,h=this.select[0].selectedIndex===-1?0:this.select[0].selectedIndex,i=this.button.insertBefore(this.select).buttonMarkup({theme:d.theme,icon:d.icon,iconpos:g,inline:e,corners:d.corners,shadow:d.shadow,iconshadow:d.iconshadow,mini:f});this.setButtonText(),d.nativeMenu&&b.opera&&b.opera.version&&i.addClass("ui-select-nativeonly"),this.isMultiple&&(this.buttonCount=a("<span>").addClass("ui-li-count ui-btn-up-c ui-btn-corner-all").hide().appendTo(i.addClass("ui-li-has-count"))),(d.disabled||this.element.attr("disabled"))&&this.disable(),this.select.change(function(){c.refresh()}),this.build()},build:function(){var b=this;this.select.appendTo(b.button).bind("vmousedown",function(){b.button.addClass(a.mobile.activeBtnClass)}).bind("focus",function(){b.button.addClass(a.mobile.focusClass)}).bind("blur",function(){b.button.removeClass(a.mobile.focusClass)}).bind("focus vmouseover",function(){b.button.trigger("vmouseover")}).bind("vmousemove",function(){b.button.removeClass(a.mobile.activeBtnClass)}).bind("change blur vmouseout",function(){b.button.trigger("vmouseout").removeClass(a.mobile.activeBtnClass)}).bind("change blur",function(){b.button.removeClass("ui-btn-down-"+b.options.theme)}),b.button.bind("vmousedown",function(){b.options.preventFocusZoom&&a.mobile.zoom.disable(!0)}).bind("mouseup",function(){b.options.preventFocusZoom&&setTimeout(function(){a.mobile.zoom.enable(!0)},0)})},selected:function(){return this._selectOptions().filter(":selected")},selectedIndices:function(){var a=this;return this.selected().map(function(){return a._selectOptions().index(this)}).get()},setButtonText:function(){var b=this,d=this.selected(),e=this.placeholder,f=a(c.createElement("span"));this.button.find(".ui-btn-text").html(function(){return d.length?e=d.map(function(){return a(this).text()}).get().join(", "):e=b.placeholder,f.text(e).addClass(b.select.attr("class")).addClass(d.attr("class"))})},setButtonCount:function(){var a=this.selected();this.isMultiple&&this.buttonCount[a.length>1?"show":"hide"]().text(a.length)},refresh:function(){this.setButtonText(),this.setButtonCount()},open:a.noop,close:a.noop,disable:function(){this._setDisabled(!0),this.button.addClass("ui-disabled")},enable:function(){this._setDisabled(!1),this.button.removeClass("ui-disabled")}}),a(c).bind("pagecreate create",function(b){a.mobile.selectmenu.prototype.enhanceWithin(b.target,!0)})}(a),function(a,d){var e=function(d){var e=d.select,f=d.selectID,g=d.label,h=d.select.closest(".ui-page"),i=d._selectOptions(),j=d.isMultiple=d.select[0].multiple,k=f+"-button",l=f+"-menu",m=a("<div data-"+a.mobile.ns+"role='dialog' data-"+a.mobile.ns+"theme='"+d.options.theme+"' data-"+a.mobile.ns+"overlay-theme='"+d.options.overlayTheme+"'>"+"<div data-"+a.mobile.ns+"role='header'>"+"<div class='ui-title'>"+g.getEncodedText()+"</div>"+"</div>"+"<div data-"+a.mobile.ns+"role='content'></div>"+"</div>"),n=a("<div>",{"class":"ui-selectmenu"}).insertAfter(d.select).popup({theme:"a"}),o=a("<ul>",{"class":"ui-selectmenu-list",id:l,role:"listbox","aria-labelledby":k}).attr("data-"+a.mobile.ns+"theme",d.options.theme).appendTo(n),p=a("<div>",{"class":"ui-header ui-bar-"+d.options.theme}).prependTo(n),q=a("<h1>",{"class":"ui-title"}).appendTo(p),r,s,t;d.isMultiple&&(t=a("<a>",{text:d.options.closeText,href:"#","class":"ui-btn-left"}).attr("data-"+a.mobile.ns+"iconpos","notext").attr("data-"+a.mobile.ns+"icon","delete").appendTo(p).buttonMarkup()),a.extend(d,{select:d.select,selectID:f,buttonId:k,menuId:l,thisPage:h,menuPage:m,label:g,selectOptions:i,isMultiple:j,theme:d.options.theme,listbox:n,list:o,header:p,headerTitle:q,headerClose:t,menuPageContent:r,menuPageClose:s,placeholder:"",build:function(){var b=this;b.refresh(),b.select.attr("tabindex","-1").focus(function(){a(this).blur(),b.button.focus()}),b.button.bind("vclick keydown",function(c){if(c.type==="vclick"||c.keyCode&&(c.keyCode===a.mobile.keyCode.ENTER||c.keyCode===a.mobile.keyCode.SPACE))b.open(),c.preventDefault()}),b.list.attr("role","listbox").bind("focusin",function(b){a(b.target).attr("tabindex","0").trigger("vmouseover")}).bind("focusout",function(b){a(b.target).attr("tabindex","-1").trigger("vmouseout")}).delegate("li:not(.ui-disabled, .ui-li-divider)","click",function(c){var e=b.select[0].selectedIndex,f=b.list.find("li:not(.ui-li-divider)").index(this),g=b._selectOptions().eq(f)[0];g.selected=b.isMultiple?!g.selected:!0,b.isMultiple&&a(this).find(".ui-icon").toggleClass("ui-icon-checkbox-on",g.selected).toggleClass("ui-icon-checkbox-off",!g.selected),(b.isMultiple||e!==f)&&b.select.trigger("change"),b.isMultiple?b.list.find("li:not(.ui-li-divider)").eq(f).addClass("ui-btn-down-"+d.options.theme).find("a").first().focus():b.close(),c.preventDefault()}).keydown(function(b){var c=a(b.target),e=c.closest("li"),f,g;switch(b.keyCode){case 38:return f=e.prev().not(".ui-selectmenu-placeholder"),f.is(".ui-li-divider")&&(f=f.prev()),f.length&&(c.blur().attr("tabindex","-1"),f.addClass("ui-btn-down-"+d.options.theme).find("a").first().focus()),!1;case 40:return g=e.next(),g.is(".ui-li-divider")&&(g=g.next()),g.length&&(c.blur().attr("tabindex","-1"),g.addClass("ui-btn-down-"+d.options.theme).find("a").first().focus()),!1;case 13:case 32:return c.trigger("click"),!1}}),b.menuPage.bind("pagehide",function(){b.list.appendTo(b.listbox),b._focusButton(),a.mobile._bindPageRemove.call(b.thisPage)}),b.listbox.bind("popupafterclose",function(a){b.close()}),b.isMultiple&&b.headerClose.click(function(){if(b.menuType==="overlay")return b.close(),!1}),b.thisPage.addDependents(this.menuPage)},_isRebuildRequired:function(){var a=this.list.find("li"),b=this._selectOptions();return b.text()!==a.text()},selected:function(){return this._selectOptions().filter(":selected:not( :jqmData(placeholder='true') )")},refresh:function(b,c){var d=this,e=this.element,f=this.isMultiple,g;(b||this._isRebuildRequired())&&d._buildList(),g=this.selectedIndices(),d.setButtonText(),d.setButtonCount(),d.list.find("li:not(.ui-li-divider)").removeClass(a.mobile.activeBtnClass).attr("aria-selected",!1).each(function(b){if(a.inArray(b,g)>-1){var c=a(this);c.attr("aria-selected",!0),d.isMultiple?c.find(".ui-icon").removeClass("ui-icon-checkbox-off").addClass("ui-icon-checkbox-on"):c.is(".ui-selectmenu-placeholder")?c.next().addClass(a.mobile.activeBtnClass):c.addClass(a.mobile.activeBtnClass)}})},close:function(){if(this.options.disabled||!this.isOpen)return;var b=this;b.menuType==="page"?a.mobile.back():(b.listbox.popup("close"),b.list.appendTo(b.listbox),b._focusButton()),b.isOpen=!1},open:function(){function o(){var b=c.list.find("."+a.mobile.activeBtnClass+" a");b.length===0&&(b=c.list.find("li.ui-btn:not( :jqmData(placeholder='true') ) a")),b.first().focus().closest("li").addClass("ui-btn-down-"+d.options.theme)}if(this.options.disabled)return;var c=this,e=a(b),f=c.list.parent(),g=f.outerHeight(),h=f.outerWidth(),i=a("."+a.mobile.activePageClass),j=e.scrollTop(),k=c.button.offset().top,l=e.height(),n=e.width();c.button.addClass(a.mobile.activeBtnClass),setTimeout(function(){c.button.removeClass(a.mobile.activeBtnClass)},300),g>l-80||!a.support.scrollTop?(c.menuPage.appendTo(a.mobile.pageContainer).page(),c.menuPageContent=m.find(".ui-content"),c.menuPageClose=m.find(".ui-header a"),c.thisPage.unbind("pagehide.remove"),j===0&&k>l&&c.thisPage.one("pagehide",function(){a(this).jqmData("lastScroll",k)}),c.menuPage.one("pageshow",function(){o(),c.isOpen=!0}),c.menuType="page",c.menuPageContent.append(c.list),c.menuPage.find("div .ui-title").text(c.label.text()),a.mobile.changePage(c.menuPage,{transition:a.mobile.defaultDialogTransition})):(c.menuType="overlay",c.listbox.one("popupafteropen",o).popup("open",{x:c.button.offset().left+c.button.outerWidth()/2,y:c.button.offset().top+c.button.outerHeight()/2}),c.isOpen=!0)},_buildList:function(){var b=this,d=this.options,e=this.placeholder,f=!0,g=[],h=[],i=b.isMultiple?"checkbox-off":"false";b.list.empty().filter(".ui-listview").listview("destroy");var j=b.select.find("option"),k=j.length,l=this.select[0],m="data-"+a.mobile.ns,n=m+"option-index",o=m+"icon",p=m+"role",q=m+"placeholder",r=c.createDocumentFragment(),s=!1,t;for(var u=0;u<k;u++,s=!1){var v=j[u],w=a(v),x=v.parentNode,y=w.text(),z=c.createElement("a"),A=[];z.setAttribute("href","#"),z.appendChild(c.createTextNode(y));if(x!==l&&x.nodeName.toLowerCase()==="optgroup"){var B=x.getAttribute("label");if(B!==t){var C=c.createElement("li");C.setAttribute(p,"list-divider"),C.setAttribute("role","option"),C.setAttribute("tabindex","-1"),C.appendChild(c.createTextNode(B)),r.appendChild(C),t=B}}f&&(!v.getAttribute("value")||y.length===0||w.jqmData("placeholder"))&&(f=!1,s=!0,v.setAttribute(q,!0),d.hidePlaceholderMenuItems&&A.push("ui-selectmenu-placeholder"),e||(e=b.placeholder=y));var D=c.createElement("li");v.disabled&&(A.push("ui-disabled"),D.setAttribute("aria-disabled",!0)),D.setAttribute(n,u),D.setAttribute(o,i),s&&D.setAttribute(q,!0),D.className=A.join(" "),D.setAttribute("role","option"),z.setAttribute("tabindex","-1"),D.appendChild(z),r.appendChild(D)}b.list[0].appendChild(r),!this.isMultiple&&!e.length?this.header.hide():this.headerTitle.text(this.placeholder),b.list.listview()},_button:function(){return a("<a>",{href:"#",role:"button",id:this.buttonId,"aria-haspopup":"true","aria-owns":this.menuId})}})};a(c).bind("selectmenubeforecreate",function(b){var c=a(b.target).data("selectmenu");!c.options.nativeMenu&&c.element.parents(":jqmData(role='popup')").length===0&&e(c)})}(a),function(a,d){a.widget("mobile.fixedtoolbar",a.mobile.widget,{options:{visibleOnPageShow:!0,disablePageZoom:!0,transition:"slide",fullscreen:!1,tapToggle:!0,tapToggleBlacklist:"a, button, input, select, textarea, .ui-header-fixed, .ui-footer-fixed, .ui-popup",hideDuringFocus:"input, textarea, select",updatePagePadding:!0,trackPersistentToolbars:!0,supportBlacklist:function(){var a=b,c=navigator.userAgent,d=navigator.platform,e=c.match(/AppleWebKit\/([0-9]+)/),f=!!e&&e[1],g=c.match(/Fennec\/([0-9]+)/),h=!!g&&g[1],i=c.match(/Opera Mobi\/([0-9]+)/),j=!!i&&i[1];return(d.indexOf("iPhone")>-1||d.indexOf("iPad")>-1||d.indexOf("iPod")>-1)&&f&&f<534||a.operamini&&{}.toString.call(a.operamini)==="[object OperaMini]"||i&&j<7458||c.indexOf("Android")>-1&&f&&f<533||h&&h<6||"palmGetResource"in b&&f&&f<534||c.indexOf("MeeGo")>-1&&c.indexOf("NokiaBrowser/8.5.0")>-1?!0:!1},initSelector:":jqmData(position='fixed')"},_create:function(){var a=this,b=a.options,c=a.element,d=c.is(":jqmData(role='header')")?"header":"footer",e=c.closest(".ui-page");if(b.supportBlacklist()){a.destroy();return}c.addClass("ui-"+d+"-fixed"),b.fullscreen?(c.addClass("ui-"+d+"-fullscreen"),e.addClass("ui-page-"+d+"-fullscreen")):e.addClass("ui-page-"+d+"-fixed"),a._addTransitionClass(),a._bindPageEvents(),a._bindToggleHandlers()},_addTransitionClass:function(){var a=this.options.transition;a&&a!=="none"&&(a==="slide"&&(a=this.element.is(".ui-header")?"slidedown":"slideup"),this.element.addClass(a))},_bindPageEvents:function(){var c=this,d=c.options,e=c.element;e.closest(".ui-page").bind("pagebeforeshow",function(){d.disablePageZoom&&a.mobile.zoom.disable(!0),d.visibleOnPageShow||c.hide(!0)}).bind("webkitAnimationStart animationstart updatelayout",function(){var a=this;d.updatePagePadding&&c.updatePagePadding(a)}).bind("pageshow",function(){var e=this;c.updatePagePadding(e),d.updatePagePadding&&a(b).bind("throttledresize."+c.widgetName,function(){c.updatePagePadding(e)})}).bind("pagebeforehide",function(e,f){d.disablePageZoom&&a.mobile.zoom.enable(!0),d.updatePagePadding&&a(b).unbind("throttledresize."+c.widgetName);if(d.trackPersistentToolbars){var g=a(".ui-footer-fixed:jqmData(id)",this),h=a(".ui-header-fixed:jqmData(id)",this),i=g.length&&f.nextPage&&a(".ui-footer-fixed:jqmData(id='"+g.jqmData("id")+"')",f.nextPage)||a(),j=h.length&&f.nextPage&&a(".ui-header-fixed:jqmData(id='"+h.jqmData("id")+"')",f.nextPage)||a();if(i.length||j.length)i.add(j).appendTo(a.mobile.pageContainer),f.nextPage.one("pageshow",function(){i.add(j).appendTo(this)})}})},_visible:!0,updatePagePadding:function(b){var c=this.element,d=c.is(".ui-header");if(this.options.fullscreen)return;b=b||c.closest(".ui-page"),a(b).css("padding-"+(d?"top":"bottom"),c.outerHeight())},_useTransition:function(c){var d=a(b),e=this.element,f=d.scrollTop(),g=e.height(),h=e.closest(".ui-page").height(),i=a.mobile.getScreenHeight(),j=e.is(":jqmData(role='header')")?"header":"footer";return!c&&(this.options.transition&&this.options.transition!=="none"&&(j==="header"&&!this.options.fullscreen&&f>g||j==="footer"&&!this.options.fullscreen&&f+i<h-g)||this.options.fullscreen)},show:function(a){var b="ui-fixed-hidden",c=this.element;this._useTransition(a)?c.removeClass("out "+b).addClass("in"):c.removeClass(b),this._visible=!0},hide:function(a){var b="ui-fixed-hidden",c=this.element,d="out"+(this.options.transition==="slide"?" reverse":"");this._useTransition(a)?c.addClass(d).removeClass("in").animationComplete(function(){c.addClass(b).removeClass(d)}):c.addClass(b).removeClass(d),this._visible=!1},toggle:function(){this[this._visible?"hide":"show"]()},_bindToggleHandlers:function(){var b=this,c=b.options,d=b.element;d.closest(".ui-page").bind("vclick",function(d){c.tapToggle&&!a(d.target).closest(c.tapToggleBlacklist).length&&b.toggle()}).bind("focusin focusout",function(d){screen.width<500&&a(d.target).is(c.hideDuringFocus)&&!a(d.target).closest(".ui-header-fixed, .ui-footer-fixed").length&&b[d.type==="focusin"&&b._visible?"hide":"show"]()})},destroy:function(){this.element.removeClass("ui-header-fixed ui-footer-fixed ui-header-fullscreen ui-footer-fullscreen in out fade slidedown slideup ui-fixed-hidden"),this.element.closest(".ui-page").removeClass("ui-page-header-fixed ui-page-footer-fixed ui-page-header-fullscreen ui-page-footer-fullscreen")}}),a(c).bind("pagecreate create",function(b){a(b.target).jqmData("fullscreen")&&a(a.mobile.fixedtoolbar.prototype.options.initSelector,b.target).not(":jqmData(fullscreen)").jqmData("fullscreen",!0),a.mobile.fixedtoolbar.prototype.enhanceWithin(b.target)})}(a),function(a,b){function i(a){d=a.originalEvent,h=d.accelerationIncludingGravity,e=Math.abs(h.x),f=Math.abs(h.y),g=Math.abs(h.z),!b.orientation&&(e>7||(g>6&&f<8||g<8&&f>6)&&e>5)?c.enabled&&c.disable():c.enabled||c.enable()}if(!(/iPhone|iPad|iPod/.test(navigator.platform)&&navigator.userAgent.indexOf("AppleWebKit")>-1))return;var c=a.mobile.zoom,d,e,f,g,h;a(b).bind("orientationchange.iosorientationfix",c.enable).bind("devicemotion.iosorientationfix",i)}(a,this),function(a,b,d){function h(){e.removeClass("ui-mobile-rendering")}var e=a("html"),f=a("head"),g=a(b);a(b.document).trigger("mobileinit");if(!a.mobile.gradeA())return;a.mobile.ajaxBlacklist&&(a.mobile.ajaxEnabled=!1),e.addClass("ui-mobile ui-mobile-rendering"),setTimeout(h,5e3),a.extend(a.mobile,{initializePage:function(){var b=a(":jqmData(role='page'), :jqmData(role='dialog')"),d=a.mobile.path.parseLocation().hash.replace("#",""),e=c.getElementById(d);b.length||(b=a("body").wrapInner("<div data-"+a.mobile.ns+"role='page'></div>").children(0)),b.each(function(){var b=a(this);b.jqmData("url")||b.attr("data-"+a.mobile.ns+"url",b.attr("id")||location.pathname+location.search)}),a.mobile.firstPage=b.first(),a.mobile.pageContainer=b.first().parent().addClass("ui-mobile-viewport"),g.trigger("pagecontainercreate"),a.mobile.showPageLoadingMsg(),h(),!a.mobile.hashListeningEnabled||!a.mobile.path.isHashValid(location.hash)||!a(e).is(':jqmData(role="page")')&&!a.mobile.path.isPath(d)&&d!==a.mobile.dialogHashKey?(a.mobile.path.isHashValid(location.hash)&&(a.mobile.urlHistory.initialDst=d.replace("#","")),a.mobile.changePage(a.mobile.firstPage,{transition:"none",reverse:!0,changeHash:!1,fromHashChange:!0})):g.trigger("hashchange",[!0])}}),a.mobile.navreadyDeferred.resolve(),a(function(){b.scrollTo(0,1),a.mobile.defaultHomeScroll=!a.support.scrollTop||a(b).scrollTop()===1?0:1,a.fn.controlgroup&&a(c).bind("pagecreate create",function(b){a(":jqmData(role='controlgroup')",b.target).jqmEnhanceable().controlgroup({excludeInvisible:!1})}),a.mobile.autoInitializePage&&a.mobile.initializePage(),g.load(a.mobile.silentScroll),a.support.cssPointerEvents||a(c).delegate(".ui-disabled","vclick",function(a){a.preventDefault(),a.stopImmediatePropagation()})})}(a,this)});
\ No newline at end of file
diff --git a/htdocs/jquery.js b/htdocs/jquery.js
new file mode 100644
index 0000000..f65cf1d
--- /dev/null
+++ b/htdocs/jquery.js
@@ -0,0 +1,2 @@
+/*! jQuery v1.8.2 jquery.com | jquery.org/license */

+(function(a,b){function G(a){var b=F[a]={};return p.each(a.split(s),function(a,c){b[c]=!0}),b}function J(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(I,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:+d+""===d?+d:H.test(d)?p.parseJSON(d):d}catch(f){}p.data(a,c,d)}else d=b}return d}function K(a){var b;for(b in a){if(b==="data"&&p.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function ba(){return!1}function bb(){return!0}function bh(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function bi(a,b){do a=a[b];while(a&&a.nodeType!==1);return a}function bj(a,b,c){b=b||0;if(p.isFunction(b))return p.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return p.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=p.grep(a,function(a){return a.nodeType===1});if(be.test(b))return p.filter(b,d,!c);b=p.filter(b,d)}return p.grep(a,function(a,d){return p.inArray(a,b)>=0===c})}function bk(a){var b=bl.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function bC(a,b){return a.getElementsByTagName(b)[0]||a.appendChild(a.ownerDocument.createElement(b))}function bD(a,b){if(b.nodeType!==1||!p.hasData(a))return;var c,d,e,f=p._data(a),g=p._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;d<e;d++)p.event.add(b,c,h[c][d])}g.data&&(g.data=p.extend({},g.data))}function bE(a,b){var c;if(b.nodeType!==1)return;b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase(),c==="object"?(b.parentNode&&(b.outerHTML=a.outerHTML),p.support.html5Clone&&a.innerHTML&&!p.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):c==="input"&&bv.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):c==="option"?b.selected=a.defaultSelected:c==="input"||c==="textarea"?b.defaultValue=a.defaultValue:c==="script"&&b.text!==a.text&&(b.text=a.text),b.removeAttribute(p.expando)}function bF(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bG(a){bv.test(a.type)&&(a.defaultChecked=a.checked)}function bY(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=bW.length;while(e--){b=bW[e]+c;if(b in a)return b}return d}function bZ(a,b){return a=b||a,p.css(a,"display")==="none"||!p.contains(a.ownerDocument,a)}function b$(a,b){var c,d,e=[],f=0,g=a.length;for(;f<g;f++){c=a[f];if(!c.style)continue;e[f]=p._data(c,"olddisplay"),b?(!e[f]&&c.style.display==="none"&&(c.style.display=""),c.style.display===""&&bZ(c)&&(e[f]=p._data(c,"olddisplay",cc(c.nodeName)))):(d=bH(c,"display"),!e[f]&&d!=="none"&&p._data(c,"olddisplay",d))}for(f=0;f<g;f++){c=a[f];if(!c.style)continue;if(!b||c.style.display==="none"||c.style.display==="")c.style.display=b?e[f]||"":"none"}return a}function b_(a,b,c){var d=bP.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function ca(a,b,c,d){var e=c===(d?"border":"content")?4:b==="width"?1:0,f=0;for(;e<4;e+=2)c==="margin"&&(f+=p.css(a,c+bV[e],!0)),d?(c==="content"&&(f-=parseFloat(bH(a,"padding"+bV[e]))||0),c!=="margin"&&(f-=parseFloat(bH(a,"border"+bV[e]+"Width"))||0)):(f+=parseFloat(bH(a,"padding"+bV[e]))||0,c!=="padding"&&(f+=parseFloat(bH(a,"border"+bV[e]+"Width"))||0));return f}function cb(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=!0,f=p.support.boxSizing&&p.css(a,"boxSizing")==="border-box";if(d<=0||d==null){d=bH(a,b);if(d<0||d==null)d=a.style[b];if(bQ.test(d))return d;e=f&&(p.support.boxSizingReliable||d===a.style[b]),d=parseFloat(d)||0}return d+ca(a,b,c||(f?"border":"content"),e)+"px"}function cc(a){if(bS[a])return bS[a];var b=p("<"+a+">").appendTo(e.body),c=b.css("display");b.remove();if(c==="none"||c===""){bI=e.body.appendChild(bI||p.extend(e.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!bJ||!bI.createElement)bJ=(bI.contentWindow||bI.contentDocument).document,bJ.write("<!doctype html><html><body>"),bJ.close();b=bJ.body.appendChild(bJ.createElement(a)),c=bH(b,"display"),e.body.removeChild(bI)}return bS[a]=c,c}function ci(a,b,c,d){var e;if(p.isArray(b))p.each(b,function(b,e){c||ce.test(a)?d(a,e):ci(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&p.type(b)==="object")for(e in b)ci(a+"["+e+"]",b[e],c,d);else d(a,b)}function cz(a){return function(b,c){typeof b!="string"&&(c=b,b="*");var d,e,f,g=b.toLowerCase().split(s),h=0,i=g.length;if(p.isFunction(c))for(;h<i;h++)d=g[h],f=/^\+/.test(d),f&&(d=d.substr(1)||"*"),e=a[d]=a[d]||[],e[f?"unshift":"push"](c)}}function cA(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h,i=a[f],j=0,k=i?i.length:0,l=a===cv;for(;j<k&&(l||!h);j++)h=i[j](c,d,e),typeof h=="string"&&(!l||g[h]?h=b:(c.dataTypes.unshift(h),h=cA(a,c,d,e,h,g)));return(l||!h)&&!g["*"]&&(h=cA(a,c,d,e,"*",g)),h}function cB(a,c){var d,e,f=p.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((f[d]?a:e||(e={}))[d]=c[d]);e&&p.extend(!0,a,e)}function cC(a,c,d){var e,f,g,h,i=a.contents,j=a.dataTypes,k=a.responseFields;for(f in k)f in d&&(c[k[f]]=d[f]);while(j[0]==="*")j.shift(),e===b&&(e=a.mimeType||c.getResponseHeader("content-type"));if(e)for(f in i)if(i[f]&&i[f].test(e)){j.unshift(f);break}if(j[0]in d)g=j[0];else{for(f in d){if(!j[0]||a.converters[f+" "+j[0]]){g=f;break}h||(h=f)}g=g||h}if(g)return g!==j[0]&&j.unshift(g),d[g]}function cD(a,b){var c,d,e,f,g=a.dataTypes.slice(),h=g[0],i={},j=0;a.dataFilter&&(b=a.dataFilter(b,a.dataType));if(g[1])for(c in a.converters)i[c.toLowerCase()]=a.converters[c];for(;e=g[++j];)if(e!=="*"){if(h!=="*"&&h!==e){c=i[h+" "+e]||i["* "+e];if(!c)for(d in i){f=d.split(" ");if(f[1]===e){c=i[h+" "+f[0]]||i["* "+f[0]];if(c){c===!0?c=i[d]:i[d]!==!0&&(e=f[0],g.splice(j--,0,e));break}}}if(c!==!0)if(c&&a["throws"])b=c(b);else try{b=c(b)}catch(k){return{state:"parsererror",error:c?k:"No conversion from "+h+" to "+e}}}h=e}return{state:"success",data:b}}function cL(){try{return new a.XMLHttpRequest}catch(b){}}function cM(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function cU(){return setTimeout(function(){cN=b},0),cN=p.now()}function cV(a,b){p.each(b,function(b,c){var d=(cT[b]||[]).concat(cT["*"]),e=0,f=d.length;for(;e<f;e++)if(d[e].call(a,b,c))return})}function cW(a,b,c){var d,e=0,f=0,g=cS.length,h=p.Deferred().always(function(){delete i.elem}),i=function(){var b=cN||cU(),c=Math.max(0,j.startTime+j.duration-b),d=1-(c/j.duration||0),e=0,f=j.tweens.length;for(;e<f;e++)j.tweens[e].run(d);return h.notifyWith(a,[j,d,c]),d<1&&f?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:p.extend({},b),opts:p.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:cN||cU(),duration:c.duration,tweens:[],createTween:function(b,c,d){var e=p.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(e),e},stop:function(b){var c=0,d=b?j.tweens.length:0;for(;c<d;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;cX(k,j.opts.specialEasing);for(;e<g;e++){d=cS[e].call(j,a,k,j.opts);if(d)return d}return cV(j,k),p.isFunction(j.opts.start)&&j.opts.start.call(a,j),p.fx.timer(p.extend(i,{anim:j,queue:j.opts.queue,elem:a})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}function cX(a,b){var c,d,e,f,g;for(c in a){d=p.camelCase(c),e=b[d],f=a[c],p.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=p.cssHooks[d];if(g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}}function cY(a,b,c){var d,e,f,g,h,i,j,k,l=this,m=a.style,n={},o=[],q=a.nodeType&&bZ(a);c.queue||(j=p._queueHooks(a,"fx"),j.unqueued==null&&(j.unqueued=0,k=j.empty.fire,j.empty.fire=function(){j.unqueued||k()}),j.unqueued++,l.always(function(){l.always(function(){j.unqueued--,p.queue(a,"fx").length||j.empty.fire()})})),a.nodeType===1&&("height"in b||"width"in b)&&(c.overflow=[m.overflow,m.overflowX,m.overflowY],p.css(a,"display")==="inline"&&p.css(a,"float")==="none"&&(!p.support.inlineBlockNeedsLayout||cc(a.nodeName)==="inline"?m.display="inline-block":m.zoom=1)),c.overflow&&(m.overflow="hidden",p.support.shrinkWrapBlocks||l.done(function(){m.overflow=c.overflow[0],m.overflowX=c.overflow[1],m.overflowY=c.overflow[2]}));for(d in b){f=b[d];if(cP.exec(f)){delete b[d];if(f===(q?"hide":"show"))continue;o.push(d)}}g=o.length;if(g){h=p._data(a,"fxshow")||p._data(a,"fxshow",{}),q?p(a).show():l.done(function(){p(a).hide()}),l.done(function(){var b;p.removeData(a,"fxshow",!0);for(b in n)p.style(a,b,n[b])});for(d=0;d<g;d++)e=o[d],i=l.createTween(e,q?h[e]:0),n[e]=h[e]||p.style(a,e),e in h||(h[e]=i.start,q&&(i.end=i.start,i.start=e==="width"||e==="height"?1:0))}}function cZ(a,b,c,d,e){return new cZ.prototype.init(a,b,c,d,e)}function c$(a,b){var c,d={height:a},e=0;b=b?1:0;for(;e<4;e+=2-b)c=bV[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function da(a){return p.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}var c,d,e=a.document,f=a.location,g=a.navigator,h=a.jQuery,i=a.$,j=Array.prototype.push,k=Array.prototype.slice,l=Array.prototype.indexOf,m=Object.prototype.toString,n=Object.prototype.hasOwnProperty,o=String.prototype.trim,p=function(a,b){return new p.fn.init(a,b,c)},q=/[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,r=/\S/,s=/\s+/,t=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,u=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,y=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,z=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,A=/^-ms-/,B=/-([\da-z])/gi,C=function(a,b){return(b+"").toUpperCase()},D=function(){e.addEventListener?(e.removeEventListener("DOMContentLoaded",D,!1),p.ready()):e.readyState==="complete"&&(e.detachEvent("onreadystatechange",D),p.ready())},E={};p.fn=p.prototype={constructor:p,init:function(a,c,d){var f,g,h,i;if(!a)return this;if(a.nodeType)return this.context=this[0]=a,this.length=1,this;if(typeof a=="string"){a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3?f=[null,a,null]:f=u.exec(a);if(f&&(f[1]||!c)){if(f[1])return c=c instanceof p?c[0]:c,i=c&&c.nodeType?c.ownerDocument||c:e,a=p.parseHTML(f[1],i,!0),v.test(f[1])&&p.isPlainObject(c)&&this.attr.call(a,c,!0),p.merge(this,a);g=e.getElementById(f[2]);if(g&&g.parentNode){if(g.id!==f[2])return d.find(a);this.length=1,this[0]=g}return this.context=e,this.selector=a,this}return!c||c.jquery?(c||d).find(a):this.constructor(c).find(a)}return p.isFunction(a)?d.ready(a):(a.selector!==b&&(this.selector=a.selector,this.context=a.context),p.makeArray(a,this))},selector:"",jquery:"1.8.2",length:0,size:function(){return this.length},toArray:function(){return k.call(this)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=p.merge(this.constructor(),a);return d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")"),d},each:function(a,b){return p.each(this,a,b)},ready:function(a){return p.ready.promise().done(a),this},eq:function(a){return a=+a,a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(k.apply(this,arguments),"slice",k.call(arguments).join(","))},map:function(a){return this.pushStack(p.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:j,sort:[].sort,splice:[].splice},p.fn.init.prototype=p.fn,p.extend=p.fn.extend=function(){var a,c,d,e,f,g,h=arguments[0]||{},i=1,j=arguments.length,k=!1;typeof h=="boolean"&&(k=h,h=arguments[1]||{},i=2),typeof h!="object"&&!p.isFunction(h)&&(h={}),j===i&&(h=this,--i);for(;i<j;i++)if((a=arguments[i])!=null)for(c in a){d=h[c],e=a[c];if(h===e)continue;k&&e&&(p.isPlainObject(e)||(f=p.isArray(e)))?(f?(f=!1,g=d&&p.isArray(d)?d:[]):g=d&&p.isPlainObject(d)?d:{},h[c]=p.extend(k,g,e)):e!==b&&(h[c]=e)}return h},p.extend({noConflict:function(b){return a.$===p&&(a.$=i),b&&a.jQuery===p&&(a.jQuery=h),p},isReady:!1,readyWait:1,holdReady:function(a){a?p.readyWait++:p.ready(!0)},ready:function(a){if(a===!0?--p.readyWait:p.isReady)return;if(!e.body)return setTimeout(p.ready,1);p.isReady=!0;if(a!==!0&&--p.readyWait>0)return;d.resolveWith(e,[p]),p.fn.trigger&&p(e).trigger("ready").off("ready")},isFunction:function(a){return p.type(a)==="function"},isArray:Array.isArray||function(a){return p.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):E[m.call(a)]||"object"},isPlainObject:function(a){if(!a||p.type(a)!=="object"||a.nodeType||p.isWindow(a))return!1;try{if(a.constructor&&!n.call(a,"constructor")&&!n.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||n.call(a,d)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},error:function(a){throw new Error(a)},parseHTML:function(a,b,c){var d;return!a||typeof a!="string"?null:(typeof b=="boolean"&&(c=b,b=0),b=b||e,(d=v.exec(a))?[b.createElement(d[1])]:(d=p.buildFragment([a],b,c?null:[]),p.merge([],(d.cacheable?p.clone(d.fragment):d.fragment).childNodes)))},parseJSON:function(b){if(!b||typeof b!="string")return null;b=p.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(w.test(b.replace(y,"@").replace(z,"]").replace(x,"")))return(new Function("return "+b))();p.error("Invalid JSON: "+b)},parseXML:function(c){var d,e;if(!c||typeof c!="string")return null;try{a.DOMParser?(e=new DOMParser,d=e.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(f){d=b}return(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&p.error("Invalid XML: "+c),d},noop:function(){},globalEval:function(b){b&&r.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(A,"ms-").replace(B,C)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,c,d){var e,f=0,g=a.length,h=g===b||p.isFunction(a);if(d){if(h){for(e in a)if(c.apply(a[e],d)===!1)break}else for(;f<g;)if(c.apply(a[f++],d)===!1)break}else if(h){for(e in a)if(c.call(a[e],e,a[e])===!1)break}else for(;f<g;)if(c.call(a[f],f,a[f++])===!1)break;return a},trim:o&&!o.call(" ")?function(a){return a==null?"":o.call(a)}:function(a){return a==null?"":(a+"").replace(t,"")},makeArray:function(a,b){var c,d=b||[];return a!=null&&(c=p.type(a),a.length==null||c==="string"||c==="function"||c==="regexp"||p.isWindow(a)?j.call(d,a):p.merge(d,a)),d},inArray:function(a,b,c){var d;if(b){if(l)return l.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=c.length,e=a.length,f=0;if(typeof d=="number")for(;f<d;f++)a[e++]=c[f];else while(c[f]!==b)a[e++]=c[f++];return a.length=e,a},grep:function(a,b,c){var d,e=[],f=0,g=a.length;c=!!c;for(;f<g;f++)d=!!b(a[f],f),c!==d&&e.push(a[f]);return e},map:function(a,c,d){var e,f,g=[],h=0,i=a.length,j=a instanceof p||i!==b&&typeof i=="number"&&(i>0&&a[0]&&a[i-1]||i===0||p.isArray(a));if(j)for(;h<i;h++)e=c(a[h],h,d),e!=null&&(g[g.length]=e);else for(f in a)e=c(a[f],f,d),e!=null&&(g[g.length]=e);return g.concat.apply([],g)},guid:1,proxy:function(a,c){var d,e,f;return typeof c=="string"&&(d=a[c],c=a,a=d),p.isFunction(a)?(e=k.call(arguments,2),f=function(){return a.apply(c,e.concat(k.call(arguments)))},f.guid=a.guid=a.guid||p.guid++,f):b},access:function(a,c,d,e,f,g,h){var i,j=d==null,k=0,l=a.length;if(d&&typeof d=="object"){for(k in d)p.access(a,c,k,d[k],1,g,e);f=1}else if(e!==b){i=h===b&&p.isFunction(e),j&&(i?(i=c,c=function(a,b,c){return i.call(p(a),c)}):(c.call(a,e),c=null));if(c)for(;k<l;k++)c(a[k],d,i?e.call(a[k],k,c(a[k],d)):e,h);f=1}return f?a:j?c.call(a):l?c(a[0],d):g},now:function(){return(new Date).getTime()}}),p.ready.promise=function(b){if(!d){d=p.Deferred();if(e.readyState==="complete")setTimeout(p.ready,1);else if(e.addEventListener)e.addEventListener("DOMContentLoaded",D,!1),a.addEventListener("load",p.ready,!1);else{e.attachEvent("onreadystatechange",D),a.attachEvent("onload",p.ready);var c=!1;try{c=a.frameElement==null&&e.documentElement}catch(f){}c&&c.doScroll&&function g(){if(!p.isReady){try{c.doScroll("left")}catch(a){return setTimeout(g,50)}p.ready()}}()}}return d.promise(b)},p.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){E["[object "+b+"]"]=b.toLowerCase()}),c=p(e);var F={};p.Callbacks=function(a){a=typeof a=="string"?F[a]||G(a):p.extend({},a);var c,d,e,f,g,h,i=[],j=!a.once&&[],k=function(b){c=a.memory&&b,d=!0,h=f||0,f=0,g=i.length,e=!0;for(;i&&h<g;h++)if(i[h].apply(b[0],b[1])===!1&&a.stopOnFalse){c=!1;break}e=!1,i&&(j?j.length&&k(j.shift()):c?i=[]:l.disable())},l={add:function(){if(i){var b=i.length;(function d(b){p.each(b,function(b,c){var e=p.type(c);e==="function"&&(!a.unique||!l.has(c))?i.push(c):c&&c.length&&e!=="string"&&d(c)})})(arguments),e?g=i.length:c&&(f=b,k(c))}return this},remove:function(){return i&&p.each(arguments,function(a,b){var c;while((c=p.inArray(b,i,c))>-1)i.splice(c,1),e&&(c<=g&&g--,c<=h&&h--)}),this},has:function(a){return p.inArray(a,i)>-1},empty:function(){return i=[],this},disable:function(){return i=j=c=b,this},disabled:function(){return!i},lock:function(){return j=b,c||l.disable(),this},locked:function(){return!j},fireWith:function(a,b){return b=b||[],b=[a,b.slice?b.slice():b],i&&(!d||j)&&(e?j.push(b):k(b)),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!d}};return l},p.extend({Deferred:function(a){var b=[["resolve","done",p.Callbacks("once memory"),"resolved"],["reject","fail",p.Callbacks("once memory"),"rejected"],["notify","progress",p.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return p.Deferred(function(c){p.each(b,function(b,d){var f=d[0],g=a[b];e[d[1]](p.isFunction(g)?function(){var a=g.apply(this,arguments);a&&p.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f+"With"](this===e?c:this,[a])}:c[f])}),a=null}).promise()},promise:function(a){return a!=null?p.extend(a,d):d}},e={};return d.pipe=d.then,p.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[a^1][2].disable,b[2][2].lock),e[f[0]]=g.fire,e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=k.call(arguments),d=c.length,e=d!==1||a&&p.isFunction(a.promise)?d:0,f=e===1?a:p.Deferred(),g=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?k.call(arguments):d,c===h?f.notifyWith(b,c):--e||f.resolveWith(b,c)}},h,i,j;if(d>1){h=new Array(d),i=new Array(d),j=new Array(d);for(;b<d;b++)c[b]&&p.isFunction(c[b].promise)?c[b].promise().done(g(b,j,c)).fail(f.reject).progress(g(b,i,h)):--e}return e||f.resolveWith(j,c),f.promise()}}),p.support=function(){var b,c,d,f,g,h,i,j,k,l,m,n=e.createElement("div");n.setAttribute("className","t"),n.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",c=n.getElementsByTagName("*"),d=n.getElementsByTagName("a")[0],d.style.cssText="top:1px;float:left;opacity:.5";if(!c||!c.length)return{};f=e.createElement("select"),g=f.appendChild(e.createElement("option")),h=n.getElementsByTagName("input")[0],b={leadingWhitespace:n.firstChild.nodeType===3,tbody:!n.getElementsByTagName("tbody").length,htmlSerialize:!!n.getElementsByTagName("link").length,style:/top/.test(d.getAttribute("style")),hrefNormalized:d.getAttribute("href")==="/a",opacity:/^0.5/.test(d.style.opacity),cssFloat:!!d.style.cssFloat,checkOn:h.value==="on",optSelected:g.selected,getSetAttribute:n.className!=="t",enctype:!!e.createElement("form").enctype,html5Clone:e.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",boxModel:e.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},h.checked=!0,b.noCloneChecked=h.cloneNode(!0).checked,f.disabled=!0,b.optDisabled=!g.disabled;try{delete n.test}catch(o){b.deleteExpando=!1}!n.addEventListener&&n.attachEvent&&n.fireEvent&&(n.attachEvent("onclick",m=function(){b.noCloneEvent=!1}),n.cloneNode(!0).fireEvent("onclick"),n.detachEvent("onclick",m)),h=e.createElement("input"),h.value="t",h.setAttribute("type","radio"),b.radioValue=h.value==="t",h.setAttribute("checked","checked"),h.setAttribute("name","t"),n.appendChild(h),i=e.createDocumentFragment(),i.appendChild(n.lastChild),b.checkClone=i.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=h.checked,i.removeChild(h),i.appendChild(n);if(n.attachEvent)for(k in{submit:!0,change:!0,focusin:!0})j="on"+k,l=j in n,l||(n.setAttribute(j,"return;"),l=typeof n[j]=="function"),b[k+"Bubbles"]=l;return p(function(){var c,d,f,g,h="padding:0;margin:0;border:0;display:block;overflow:hidden;",i=e.getElementsByTagName("body")[0];if(!i)return;c=e.createElement("div"),c.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",i.insertBefore(c,i.firstChild),d=e.createElement("div"),c.appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",f=d.getElementsByTagName("td"),f[0].style.cssText="padding:0;margin:0;border:0;display:none",l=f[0].offsetHeight===0,f[0].style.display="",f[1].style.display="none",b.reliableHiddenOffsets=l&&f[0].offsetHeight===0,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",b.boxSizing=d.offsetWidth===4,b.doesNotIncludeMarginInBodyOffset=i.offsetTop!==1,a.getComputedStyle&&(b.pixelPosition=(a.getComputedStyle(d,null)||{}).top!=="1%",b.boxSizingReliable=(a.getComputedStyle(d,null)||{width:"4px"}).width==="4px",g=e.createElement("div"),g.style.cssText=d.style.cssText=h,g.style.marginRight=g.style.width="0",d.style.width="1px",d.appendChild(g),b.reliableMarginRight=!parseFloat((a.getComputedStyle(g,null)||{}).marginRight)),typeof d.style.zoom!="undefined"&&(d.innerHTML="",d.style.cssText=h+"width:1px;padding:1px;display:inline;zoom:1",b.inlineBlockNeedsLayout=d.offsetWidth===3,d.style.display="block",d.style.overflow="visible",d.innerHTML="<div></div>",d.firstChild.style.width="5px",b.shrinkWrapBlocks=d.offsetWidth!==3,c.style.zoom=1),i.removeChild(c),c=d=f=g=null}),i.removeChild(n),c=d=f=g=h=i=n=null,b}();var H=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,I=/([A-Z])/g;p.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(p.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){return a=a.nodeType?p.cache[a[p.expando]]:a[p.expando],!!a&&!K(a)},data:function(a,c,d,e){if(!p.acceptData(a))return;var f,g,h=p.expando,i=typeof c=="string",j=a.nodeType,k=j?p.cache:a,l=j?a[h]:a[h]&&h;if((!l||!k[l]||!e&&!k[l].data)&&i&&d===b)return;l||(j?a[h]=l=p.deletedIds.pop()||p.guid++:l=h),k[l]||(k[l]={},j||(k[l].toJSON=p.noop));if(typeof c=="object"||typeof c=="function")e?k[l]=p.extend(k[l],c):k[l].data=p.extend(k[l].data,c);return f=k[l],e||(f.data||(f.data={}),f=f.data),d!==b&&(f[p.camelCase(c)]=d),i?(g=f[c],g==null&&(g=f[p.camelCase(c)])):g=f,g},removeData:function(a,b,c){if(!p.acceptData(a))return;var d,e,f,g=a.nodeType,h=g?p.cache:a,i=g?a[p.expando]:p.expando;if(!h[i])return;if(b){d=c?h[i]:h[i].data;if(d){p.isArray(b)||(b in d?b=[b]:(b=p.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,f=b.length;e<f;e++)delete d[b[e]];if(!(c?K:p.isEmptyObject)(d))return}}if(!c){delete h[i].data;if(!K(h[i]))return}g?p.cleanData([a],!0):p.support.deleteExpando||h!=h.window?delete h[i]:h[i]=null},_data:function(a,b,c){return p.data(a,b,c,!0)},acceptData:function(a){var b=a.nodeName&&p.noData[a.nodeName.toLowerCase()];return!b||b!==!0&&a.getAttribute("classid")===b}}),p.fn.extend({data:function(a,c){var d,e,f,g,h,i=this[0],j=0,k=null;if(a===b){if(this.length){k=p.data(i);if(i.nodeType===1&&!p._data(i,"parsedAttrs")){f=i.attributes;for(h=f.length;j<h;j++)g=f[j].name,g.indexOf("data-")||(g=p.camelCase(g.substring(5)),J(i,g,k[g]));p._data(i,"parsedAttrs",!0)}}return k}return typeof a=="object"?this.each(function(){p.data(this,a)}):(d=a.split(".",2),d[1]=d[1]?"."+d[1]:"",e=d[1]+"!",p.access(this,function(c){if(c===b)return k=this.triggerHandler("getData"+e,[d[0]]),k===b&&i&&(k=p.data(i,a),k=J(i,a,k)),k===b&&d[1]?this.data(d[0]):k;d[1]=c,this.each(function(){var b=p(this);b.triggerHandler("setData"+e,d),p.data(this,a,c),b.triggerHandler("changeData"+e,d)})},null,c,arguments.length>1,null,!1))},removeData:function(a){return this.each(function(){p.removeData(this,a)})}}),p.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=p._data(a,b),c&&(!d||p.isArray(c)?d=p._data(a,b,p.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=p.queue(a,b),d=c.length,e=c.shift(),f=p._queueHooks(a,b),g=function(){p.dequeue(a,b)};e==="inprogress"&&(e=c.shift(),d--),e&&(b==="fx"&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return p._data(a,c)||p._data(a,c,{empty:p.Callbacks("once memory").add(function(){p.removeData(a,b+"queue",!0),p.removeData(a,c,!0)})})}}),p.fn.extend({queue:function(a,c){var d=2;return typeof a!="string"&&(c=a,a="fx",d--),arguments.length<d?p.queue(this[0],a):c===b?this:this.each(function(){var b=p.queue(this,a,c);p._queueHooks(this,a),a==="fx"&&b[0]!=="inprogress"&&p.dequeue(this,a)})},dequeue:function(a){return this.each(function(){p.dequeue(this,a)})},delay:function(a,b){return a=p.fx?p.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){var d,e=1,f=p.Deferred(),g=this,h=this.length,i=function(){--e||f.resolveWith(g,[g])};typeof a!="string"&&(c=a,a=b),a=a||"fx";while(h--)d=p._data(g[h],a+"queueHooks"),d&&d.empty&&(e++,d.empty.add(i));return i(),f.promise(c)}});var L,M,N,O=/[\t\r\n]/g,P=/\r/g,Q=/^(?:button|input)$/i,R=/^(?:button|input|object|select|textarea)$/i,S=/^a(?:rea|)$/i,T=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,U=p.support.getSetAttribute;p.fn.extend({attr:function(a,b){return p.access(this,p.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){p.removeAttr(this,a)})},prop:function(a,b){return p.access(this,p.prop,a,b,arguments.length>1)},removeProp:function(a){return a=p.propFix[a]||a,this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,f,g,h;if(p.isFunction(a))return this.each(function(b){p(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(s);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{f=" "+e.className+" ";for(g=0,h=b.length;g<h;g++)f.indexOf(" "+b[g]+" ")<0&&(f+=b[g]+" ");e.className=p.trim(f)}}}return this},removeClass:function(a){var c,d,e,f,g,h,i;if(p.isFunction(a))return this.each(function(b){p(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(s);for(h=0,i=this.length;h<i;h++){e=this[h];if(e.nodeType===1&&e.className){d=(" "+e.className+" ").replace(O," ");for(f=0,g=c.length;f<g;f++)while(d.indexOf(" "+c[f]+" ")>=0)d=d.replace(" "+c[f]+" "," ");e.className=a?p.trim(d):""}}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";return p.isFunction(a)?this.each(function(c){p(this).toggleClass(a.call(this,c,this.className,b),b)}):this.each(function(){if(c==="string"){var e,f=0,g=p(this),h=b,i=a.split(s);while(e=i[f++])h=d?h:!g.hasClass(e),g[h?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&p._data(this,"__className__",this.className),this.className=this.className||a===!1?"":p._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(O," ").indexOf(b)>=0)return!0;return!1},val:function(a){var c,d,e,f=this[0];if(!arguments.length){if(f)return c=p.valHooks[f.type]||p.valHooks[f.nodeName.toLowerCase()],c&&"get"in c&&(d=c.get(f,"value"))!==b?d:(d=f.value,typeof d=="string"?d.replace(P,""):d==null?"":d);return}return e=p.isFunction(a),this.each(function(d){var f,g=p(this);if(this.nodeType!==1)return;e?f=a.call(this,d,g.val()):f=a,f==null?f="":typeof f=="number"?f+="":p.isArray(f)&&(f=p.map(f,function(a){return a==null?"":a+""})),c=p.valHooks[this.type]||p.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,f,"value")===b)this.value=f})}}),p.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,f=a.selectedIndex,g=[],h=a.options,i=a.type==="select-one";if(f<0)return null;c=i?f:0,d=i?f+1:h.length;for(;c<d;c++){e=h[c];if(e.selected&&(p.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!p.nodeName(e.parentNode,"optgroup"))){b=p(e).val();if(i)return b;g.push(b)}}return i&&!g.length&&h.length?p(h[f]).val():g},set:function(a,b){var c=p.makeArray(b);return p(a).find("option").each(function(){this.selected=p.inArray(p(this).val(),c)>=0}),c.length||(a.selectedIndex=-1),c}}},attrFn:{},attr:function(a,c,d,e){var f,g,h,i=a.nodeType;if(!a||i===3||i===8||i===2)return;if(e&&p.isFunction(p.fn[c]))return p(a)[c](d);if(typeof a.getAttribute=="undefined")return p.prop(a,c,d);h=i!==1||!p.isXMLDoc(a),h&&(c=c.toLowerCase(),g=p.attrHooks[c]||(T.test(c)?M:L));if(d!==b){if(d===null){p.removeAttr(a,c);return}return g&&"set"in g&&h&&(f=g.set(a,d,c))!==b?f:(a.setAttribute(c,d+""),d)}return g&&"get"in g&&h&&(f=g.get(a,c))!==null?f:(f=a.getAttribute(c),f===null?b:f)},removeAttr:function(a,b){var c,d,e,f,g=0;if(b&&a.nodeType===1){d=b.split(s);for(;g<d.length;g++)e=d[g],e&&(c=p.propFix[e]||e,f=T.test(e),f||p.attr(a,e,""),a.removeAttribute(U?e:c),f&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(Q.test(a.nodeName)&&a.parentNode)p.error("type property can't be changed");else if(!p.support.radioValue&&b==="radio"&&p.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}},value:{get:function(a,b){return L&&p.nodeName(a,"button")?L.get(a,b):b in a?a.value:null},set:function(a,b,c){if(L&&p.nodeName(a,"button"))return L.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,f,g,h=a.nodeType;if(!a||h===3||h===8||h===2)return;return g=h!==1||!p.isXMLDoc(a),g&&(c=p.propFix[c]||c,f=p.propHooks[c]),d!==b?f&&"set"in f&&(e=f.set(a,d,c))!==b?e:a[c]=d:f&&"get"in f&&(e=f.get(a,c))!==null?e:a[c]},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):R.test(a.nodeName)||S.test(a.nodeName)&&a.href?0:b}}}}),M={get:function(a,c){var d,e=p.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;return b===!1?p.removeAttr(a,c):(d=p.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase())),c}},U||(N={name:!0,id:!0,coords:!0},L=p.valHooks.button={get:function(a,c){var d;return d=a.getAttributeNode(c),d&&(N[c]?d.value!=="":d.specified)?d.value:b},set:function(a,b,c){var d=a.getAttributeNode(c);return d||(d=e.createAttribute(c),a.setAttributeNode(d)),d.value=b+""}},p.each(["width","height"],function(a,b){p.attrHooks[b]=p.extend(p.attrHooks[b],{set:function(a,c){if(c==="")return a.setAttribute(b,"auto"),c}})}),p.attrHooks.contenteditable={get:L.get,set:function(a,b,c){b===""&&(b="false"),L.set(a,b,c)}}),p.support.hrefNormalized||p.each(["href","src","width","height"],function(a,c){p.attrHooks[c]=p.extend(p.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),p.support.style||(p.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=b+""}}),p.support.optSelected||(p.propHooks.selected=p.extend(p.propHooks.selected,{get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}})),p.support.enctype||(p.propFix.enctype="encoding"),p.support.checkOn||p.each(["radio","checkbox"],function(){p.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),p.each(["radio","checkbox"],function(){p.valHooks[this]=p.extend(p.valHooks[this],{set:function(a,b){if(p.isArray(b))return a.checked=p.inArray(p(a).val(),b)>=0}})});var V=/^(?:textarea|input|select)$/i,W=/^([^\.]*|)(?:\.(.+)|)$/,X=/(?:^|\s)hover(\.\S+|)\b/,Y=/^key/,Z=/^(?:mouse|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=function(a){return p.event.special.hover?a:a.replace(X,"mouseenter$1 mouseleave$1")};p.event={add:function(a,c,d,e,f){var g,h,i,j,k,l,m,n,o,q,r;if(a.nodeType===3||a.nodeType===8||!c||!d||!(g=p._data(a)))return;d.handler&&(o=d,d=o.handler,f=o.selector),d.guid||(d.guid=p.guid++),i=g.events,i||(g.events=i={}),h=g.handle,h||(g.handle=h=function(a){return typeof p!="undefined"&&(!a||p.event.triggered!==a.type)?p.event.dispatch.apply(h.elem,arguments):b},h.elem=a),c=p.trim(_(c)).split(" ");for(j=0;j<c.length;j++){k=W.exec(c[j])||[],l=k[1],m=(k[2]||"").split(".").sort(),r=p.event.special[l]||{},l=(f?r.delegateType:r.bindType)||l,r=p.event.special[l]||{},n=p.extend({type:l,origType:k[1],data:e,handler:d,guid:d.guid,selector:f,needsContext:f&&p.expr.match.needsContext.test(f),namespace:m.join(".")},o),q=i[l];if(!q){q=i[l]=[],q.delegateCount=0;if(!r.setup||r.setup.call(a,e,m,h)===!1)a.addEventListener?a.addEventListener(l,h,!1):a.attachEvent&&a.attachEvent("on"+l,h)}r.add&&(r.add.call(a,n),n.handler.guid||(n.handler.guid=d.guid)),f?q.splice(q.delegateCount++,0,n):q.push(n),p.event.global[l]=!0}a=null},global:{},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,q,r=p.hasData(a)&&p._data(a);if(!r||!(m=r.events))return;b=p.trim(_(b||"")).split(" ");for(f=0;f<b.length;f++){g=W.exec(b[f])||[],h=i=g[1],j=g[2];if(!h){for(h in m)p.event.remove(a,h+b[f],c,d,!0);continue}n=p.event.special[h]||{},h=(d?n.delegateType:n.bindType)||h,o=m[h]||[],k=o.length,j=j?new RegExp("(^|\\.)"+j.split(".").sort().join("\\.(?:.*\\.|)")+"(\\.|$)"):null;for(l=0;l<o.length;l++)q=o[l],(e||i===q.origType)&&(!c||c.guid===q.guid)&&(!j||j.test(q.namespace))&&(!d||d===q.selector||d==="**"&&q.selector)&&(o.splice(l--,1),q.selector&&o.delegateCount--,n.remove&&n.remove.call(a,q));o.length===0&&k!==o.length&&((!n.teardown||n.teardown.call(a,j,r.handle)===!1)&&p.removeEvent(a,h,r.handle),delete m[h])}p.isEmptyObject(m)&&(delete r.handle,p.removeData(a,"events",!0))},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,f,g){if(!f||f.nodeType!==3&&f.nodeType!==8){var h,i,j,k,l,m,n,o,q,r,s=c.type||c,t=[];if($.test(s+p.event.triggered))return;s.indexOf("!")>=0&&(s=s.slice(0,-1),i=!0),s.indexOf(".")>=0&&(t=s.split("."),s=t.shift(),t.sort());if((!f||p.event.customEvent[s])&&!p.event.global[s])return;c=typeof c=="object"?c[p.expando]?c:new p.Event(s,c):new p.Event(s),c.type=s,c.isTrigger=!0,c.exclusive=i,c.namespace=t.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+t.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,m=s.indexOf(":")<0?"on"+s:"";if(!f){h=p.cache;for(j in h)h[j].events&&h[j].events[s]&&p.event.trigger(c,d,h[j].handle.elem,!0);return}c.result=b,c.target||(c.target=f),d=d!=null?p.makeArray(d):[],d.unshift(c),n=p.event.special[s]||{};if(n.trigger&&n.trigger.apply(f,d)===!1)return;q=[[f,n.bindType||s]];if(!g&&!n.noBubble&&!p.isWindow(f)){r=n.delegateType||s,k=$.test(r+s)?f:f.parentNode;for(l=f;k;k=k.parentNode)q.push([k,r]),l=k;l===(f.ownerDocument||e)&&q.push([l.defaultView||l.parentWindow||a,r])}for(j=0;j<q.length&&!c.isPropagationStopped();j++)k=q[j][0],c.type=q[j][1],o=(p._data(k,"events")||{})[c.type]&&p._data(k,"handle"),o&&o.apply(k,d),o=m&&k[m],o&&p.acceptData(k)&&o.apply&&o.apply(k,d)===!1&&c.preventDefault();return c.type=s,!g&&!c.isDefaultPrevented()&&(!n._default||n._default.apply(f.ownerDocument,d)===!1)&&(s!=="click"||!p.nodeName(f,"a"))&&p.acceptData(f)&&m&&f[s]&&(s!=="focus"&&s!=="blur"||c.target.offsetWidth!==0)&&!p.isWindow(f)&&(l=f[m],l&&(f[m]=null),p.event.triggered=s,f[s](),p.event.triggered=b,l&&(f[m]=l)),c.result}return},dispatch:function(c){c=p.event.fix(c||a.event);var d,e,f,g,h,i,j,l,m,n,o=(p._data(this,"events")||{})[c.type]||[],q=o.delegateCount,r=k.call(arguments),s=!c.exclusive&&!c.namespace,t=p.event.special[c.type]||{},u=[];r[0]=c,c.delegateTarget=this;if(t.preDispatch&&t.preDispatch.call(this,c)===!1)return;if(q&&(!c.button||c.type!=="click"))for(f=c.target;f!=this;f=f.parentNode||this)if(f.disabled!==!0||c.type!=="click"){h={},j=[];for(d=0;d<q;d++)l=o[d],m=l.selector,h[m]===b&&(h[m]=l.needsContext?p(m,this).index(f)>=0:p.find(m,this,null,[f]).length),h[m]&&j.push(l);j.length&&u.push({elem:f,matches:j})}o.length>q&&u.push({elem:this,matches:o.slice(q)});for(d=0;d<u.length&&!c.isPropagationStopped();d++){i=u[d],c.currentTarget=i.elem;for(e=0;e<i.matches.length&&!c.isImmediatePropagationStopped();e++){l=i.matches[e];if(s||!c.namespace&&!l.namespace||c.namespace_re&&c.namespace_re.test(l.namespace))c.data=l.data,c.handleObj=l,g=((p.event.special[l.origType]||{}).handle||l.handler).apply(i.elem,r),g!==b&&(c.result=g,g===!1&&(c.preventDefault(),c.stopPropagation()))}}return t.postDispatch&&t.postDispatch.call(this,c),c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,c){var d,f,g,h=c.button,i=c.fromElement;return a.pageX==null&&c.clientX!=null&&(d=a.target.ownerDocument||e,f=d.documentElement,g=d.body,a.pageX=c.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=c.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?c.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0),a}},fix:function(a){if(a[p.expando])return a;var b,c,d=a,f=p.event.fixHooks[a.type]||{},g=f.props?this.props.concat(f.props):this.props;a=p.Event(d);for(b=g.length;b;)c=g[--b],a[c]=d[c];return a.target||(a.target=d.srcElement||e),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,f.filter?f.filter(a,d):a},special:{load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){p.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=p.extend(new p.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?p.event.trigger(e,null,b):p.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},p.event.handle=p.event.dispatch,p.removeEvent=e.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]=="undefined"&&(a[d]=null),a.detachEvent(d,c))},p.Event=function(a,b){if(this instanceof p.Event)a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?bb:ba):this.type=a,b&&p.extend(this,b),this.timeStamp=a&&a.timeStamp||p.now(),this[p.expando]=!0;else return new p.Event(a,b)},p.Event.prototype={preventDefault:function(){this.isDefaultPrevented=bb;var a=this.originalEvent;if(!a)return;a.preventDefault?a.preventDefault():a.returnValue=!1},stopPropagation:function(){this.isPropagationStopped=bb;var a=this.originalEvent;if(!a)return;a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=bb,this.stopPropagation()},isDefaultPrevented:ba,isPropagationStopped:ba,isImmediatePropagationStopped:ba},p.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){p.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj,g=f.selector;if(!e||e!==d&&!p.contains(d,e))a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b;return c}}}),p.support.submitBubbles||(p.event.special.submit={setup:function(){if(p.nodeName(this,"form"))return!1;p.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=p.nodeName(c,"input")||p.nodeName(c,"button")?c.form:b;d&&!p._data(d,"_submit_attached")&&(p.event.add(d,"submit._submit",function(a){a._submit_bubble=!0}),p._data(d,"_submit_attached",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&p.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){if(p.nodeName(this,"form"))return!1;p.event.remove(this,"._submit")}}),p.support.changeBubbles||(p.event.special.change={setup:function(){if(V.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")p.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),p.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),p.event.simulate("change",this,a,!0)});return!1}p.event.add(this,"beforeactivate._change",function(a){var b=a.target;V.test(b.nodeName)&&!p._data(b,"_change_attached")&&(p.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&p.event.simulate("change",this.parentNode,a,!0)}),p._data(b,"_change_attached",!0))})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){return p.event.remove(this,"._change"),!V.test(this.nodeName)}}),p.support.focusinBubbles||p.each({focus:"focusin",blur:"focusout"},function(a,b){var c=0,d=function(a){p.event.simulate(b,a.target,p.event.fix(a),!0)};p.event.special[b]={setup:function(){c++===0&&e.addEventListener(a,d,!0)},teardown:function(){--c===0&&e.removeEventListener(a,d,!0)}}}),p.fn.extend({on:function(a,c,d,e,f){var g,h;if(typeof a=="object"){typeof c!="string"&&(d=d||c,c=b);for(h in a)this.on(h,c,d,a[h],f);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=ba;else if(!e)return this;return f===1&&(g=e,e=function(a){return p().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=p.guid++)),this.each(function(){p.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,c,d){var e,f;if(a&&a.preventDefault&&a.handleObj)return e=a.handleObj,p(a.delegateTarget).off(e.namespace?e.origType+"."+e.namespace:e.origType,e.selector,e.handler),this;if(typeof a=="object"){for(f in a)this.off(f,c,a[f]);return this}if(c===!1||typeof c=="function")d=c,c=b;return d===!1&&(d=ba),this.each(function(){p.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){return p(this.context).on(a,this.selector,b,c),this},die:function(a,b){return p(this.context).off(a,this.selector||"**",b),this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length===1?this.off(a,"**"):this.off(b,a||"**",c)},trigger:function(a,b){return this.each(function(){p.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return p.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||p.guid++,d=0,e=function(c){var e=(p._data(this,"lastToggle"+a.guid)||0)%d;return p._data(this,"lastToggle"+a.guid,e+1),c.preventDefault(),b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),p.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){p.fn[b]=function(a,c){return c==null&&(c=a,a=null),arguments.length>0?this.on(b,null,a,c):this.trigger(b)},Y.test(b)&&(p.event.fixHooks[b]=p.event.keyHooks),Z.test(b)&&(p.event.fixHooks[b]=p.event.mouseHooks)}),function(a,b){function bc(a,b,c,d){c=c||[],b=b||r;var e,f,i,j,k=b.nodeType;if(!a||typeof a!="string")return c;if(k!==1&&k!==9)return[];i=g(b);if(!i&&!d)if(e=P.exec(a))if(j=e[1]){if(k===9){f=b.getElementById(j);if(!f||!f.parentNode)return c;if(f.id===j)return c.push(f),c}else if(b.ownerDocument&&(f=b.ownerDocument.getElementById(j))&&h(b,f)&&f.id===j)return c.push(f),c}else{if(e[2])return w.apply(c,x.call(b.getElementsByTagName(a),0)),c;if((j=e[3])&&_&&b.getElementsByClassName)return w.apply(c,x.call(b.getElementsByClassName(j),0)),c}return bp(a.replace(L,"$1"),b,c,d,i)}function bd(a){return function(b){var c=b.nodeName.toLowerCase();return c==="input"&&b.type===a}}function be(a){return function(b){var c=b.nodeName.toLowerCase();return(c==="input"||c==="button")&&b.type===a}}function bf(a){return z(function(b){return b=+b,z(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function bg(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}function bh(a,b){var c,d,f,g,h,i,j,k=C[o][a];if(k)return b?0:k.slice(0);h=a,i=[],j=e.preFilter;while(h){if(!c||(d=M.exec(h)))d&&(h=h.slice(d[0].length)),i.push(f=[]);c=!1;if(d=N.exec(h))f.push(c=new q(d.shift())),h=h.slice(c.length),c.type=d[0].replace(L," ");for(g in e.filter)(d=W[g].exec(h))&&(!j[g]||(d=j[g](d,r,!0)))&&(f.push(c=new q(d.shift())),h=h.slice(c.length),c.type=g,c.matches=d);if(!c)break}return b?h.length:h?bc.error(a):C(a,i).slice(0)}function bi(a,b,d){var e=b.dir,f=d&&b.dir==="parentNode",g=u++;return b.first?function(b,c,d){while(b=b[e])if(f||b.nodeType===1)return a(b,c,d)}:function(b,d,h){if(!h){var i,j=t+" "+g+" ",k=j+c;while(b=b[e])if(f||b.nodeType===1){if((i=b[o])===k)return b.sizset;if(typeof i=="string"&&i.indexOf(j)===0){if(b.sizset)return b}else{b[o]=k;if(a(b,d,h))return b.sizset=!0,b;b.sizset=!1}}}else while(b=b[e])if(f||b.nodeType===1)if(a(b,d,h))return b}}function bj(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function bk(a,b,c,d,e){var f,g=[],h=0,i=a.length,j=b!=null;for(;h<i;h++)if(f=a[h])if(!c||c(f,d,e))g.push(f),j&&b.push(h);return g}function bl(a,b,c,d,e,f){return d&&!d[o]&&(d=bl(d)),e&&!e[o]&&(e=bl(e,f)),z(function(f,g,h,i){if(f&&e)return;var j,k,l,m=[],n=[],o=g.length,p=f||bo(b||"*",h.nodeType?[h]:h,[],f),q=a&&(f||!b)?bk(p,m,a,h,i):p,r=c?e||(f?a:o||d)?[]:g:q;c&&c(q,r,h,i);if(d){l=bk(r,n),d(l,[],h,i),j=l.length;while(j--)if(k=l[j])r[n[j]]=!(q[n[j]]=k)}if(f){j=a&&r.length;while(j--)if(k=r[j])f[m[j]]=!(g[m[j]]=k)}else r=bk(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):w.apply(g,r)})}function bm(a){var b,c,d,f=a.length,g=e.relative[a[0].type],h=g||e.relative[" "],i=g?1:0,j=bi(function(a){return a===b},h,!0),k=bi(function(a){return y.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==l)||((b=c).nodeType?j(a,c,d):k(a,c,d))}];for(;i<f;i++)if(c=e.relative[a[i].type])m=[bi(bj(m),c)];else{c=e.filter[a[i].type].apply(null,a[i].matches);if(c[o]){d=++i;for(;d<f;d++)if(e.relative[a[d].type])break;return bl(i>1&&bj(m),i>1&&a.slice(0,i-1).join("").replace(L,"$1"),c,i<d&&bm(a.slice(i,d)),d<f&&bm(a=a.slice(d)),d<f&&a.join(""))}m.push(c)}return bj(m)}function bn(a,b){var d=b.length>0,f=a.length>0,g=function(h,i,j,k,m){var n,o,p,q=[],s=0,u="0",x=h&&[],y=m!=null,z=l,A=h||f&&e.find.TAG("*",m&&i.parentNode||i),B=t+=z==null?1:Math.E;y&&(l=i!==r&&i,c=g.el);for(;(n=A[u])!=null;u++){if(f&&n){for(o=0;p=a[o];o++)if(p(n,i,j)){k.push(n);break}y&&(t=B,c=++g.el)}d&&((n=!p&&n)&&s--,h&&x.push(n))}s+=u;if(d&&u!==s){for(o=0;p=b[o];o++)p(x,q,i,j);if(h){if(s>0)while(u--)!x[u]&&!q[u]&&(q[u]=v.call(k));q=bk(q)}w.apply(k,q),y&&!h&&q.length>0&&s+b.length>1&&bc.uniqueSort(k)}return y&&(t=B,l=z),x};return g.el=0,d?z(g):g}function bo(a,b,c,d){var e=0,f=b.length;for(;e<f;e++)bc(a,b[e],c,d);return c}function bp(a,b,c,d,f){var g,h,j,k,l,m=bh(a),n=m.length;if(!d&&m.length===1){h=m[0]=m[0].slice(0);if(h.length>2&&(j=h[0]).type==="ID"&&b.nodeType===9&&!f&&e.relative[h[1].type]){b=e.find.ID(j.matches[0].replace(V,""),b,f)[0];if(!b)return c;a=a.slice(h.shift().length)}for(g=W.POS.test(a)?-1:h.length-1;g>=0;g--){j=h[g];if(e.relative[k=j.type])break;if(l=e.find[k])if(d=l(j.matches[0].replace(V,""),R.test(h[0].type)&&b.parentNode||b,f)){h.splice(g,1),a=d.length&&h.join("");if(!a)return w.apply(c,x.call(d,0)),c;break}}}return i(a,m)(d,b,f,c,R.test(a)),c}function bq(){}var c,d,e,f,g,h,i,j,k,l,m=!0,n="undefined",o=("sizcache"+Math.random()).replace(".",""),q=String,r=a.document,s=r.documentElement,t=0,u=0,v=[].pop,w=[].push,x=[].slice,y=[].indexOf||function(a){var b=0,c=this.length;for(;b<c;b++)if(this[b]===a)return b;return-1},z=function(a,b){return a[o]=b==null||b,a},A=function(){var a={},b=[];return z(function(c,d){return b.push(c)>e.cacheLength&&delete a[b.shift()],a[c]=d},a)},B=A(),C=A(),D=A(),E="[\\x20\\t\\r\\n\\f]",F="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",G=F.replace("w","w#"),H="([*^$|!~]?=)",I="\\["+E+"*("+F+")"+E+"*(?:"+H+E+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+G+")|)|)"+E+"*\\]",J=":("+F+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+I+")|[^:]|\\\\.)*|.*))\\)|)",K=":(even|odd|eq|gt|lt|nth|first|last)(?:\\("+E+"*((?:-\\d)?\\d*)"+E+"*\\)|)(?=[^-]|$)",L=new RegExp("^"+E+"+|((?:^|[^\\\\])(?:\\\\.)*)"+E+"+$","g"),M=new RegExp("^"+E+"*,"+E+"*"),N=new RegExp("^"+E+"*([\\x20\\t\\r\\n\\f>+~])"+E+"*"),O=new RegExp(J),P=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,Q=/^:not/,R=/[\x20\t\r\n\f]*[+~]/,S=/:not\($/,T=/h\d/i,U=/input|select|textarea|button/i,V=/\\(?!\\)/g,W={ID:new RegExp("^#("+F+")"),CLASS:new RegExp("^\\.("+F+")"),NAME:new RegExp("^\\[name=['\"]?("+F+")['\"]?\\]"),TAG:new RegExp("^("+F.replace("w","w*")+")"),ATTR:new RegExp("^"+I),PSEUDO:new RegExp("^"+J),POS:new RegExp(K,"i"),CHILD:new RegExp("^:(only|nth|first|last)-child(?:\\("+E+"*(even|odd|(([+-]|)(\\d*)n|)"+E+"*(?:([+-]|)"+E+"*(\\d+)|))"+E+"*\\)|)","i"),needsContext:new RegExp("^"+E+"*[>+~]|"+K,"i")},X=function(a){var b=r.createElement("div");try{return a(b)}catch(c){return!1}finally{b=null}},Y=X(function(a){return a.appendChild(r.createComment("")),!a.getElementsByTagName("*").length}),Z=X(function(a){return a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!==n&&a.firstChild.getAttribute("href")==="#"}),$=X(function(a){a.innerHTML="<select></select>";var b=typeof a.lastChild.getAttribute("multiple");return b!=="boolean"&&b!=="string"}),_=X(function(a){return a.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",!a.getElementsByClassName||!a.getElementsByClassName("e").length?!1:(a.lastChild.className="e",a.getElementsByClassName("e").length===2)}),ba=X(function(a){a.id=o+0,a.innerHTML="<a name='"+o+"'></a><div name='"+o+"'></div>",s.insertBefore(a,s.firstChild);var b=r.getElementsByName&&r.getElementsByName(o).length===2+r.getElementsByName(o+0).length;return d=!r.getElementById(o),s.removeChild(a),b});try{x.call(s.childNodes,0)[0].nodeType}catch(bb){x=function(a){var b,c=[];for(;b=this[a];a++)c.push(b);return c}}bc.matches=function(a,b){return bc(a,null,null,b)},bc.matchesSelector=function(a,b){return bc(b,null,null,[a]).length>0},f=bc.getText=function(a){var b,c="",d=0,e=a.nodeType;if(e){if(e===1||e===9||e===11){if(typeof a.textContent=="string")return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=f(a)}else if(e===3||e===4)return a.nodeValue}else for(;b=a[d];d++)c+=f(b);return c},g=bc.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?b.nodeName!=="HTML":!1},h=bc.contains=s.contains?function(a,b){var c=a.nodeType===9?a.documentElement:a,d=b&&b.parentNode;return a===d||!!(d&&d.nodeType===1&&c.contains&&c.contains(d))}:s.compareDocumentPosition?function(a,b){return b&&!!(a.compareDocumentPosition(b)&16)}:function(a,b){while(b=b.parentNode)if(b===a)return!0;return!1},bc.attr=function(a,b){var c,d=g(a);return d||(b=b.toLowerCase()),(c=e.attrHandle[b])?c(a):d||$?a.getAttribute(b):(c=a.getAttributeNode(b),c?typeof a[b]=="boolean"?a[b]?b:null:c.specified?c.value:null:null)},e=bc.selectors={cacheLength:50,createPseudo:z,match:W,attrHandle:Z?{}:{href:function(a){return a.getAttribute("href",2)},type:function(a){return a.getAttribute("type")}},find:{ID:d?function(a,b,c){if(typeof b.getElementById!==n&&!c){var d=b.getElementById(a);return d&&d.parentNode?[d]:[]}}:function(a,c,d){if(typeof c.getElementById!==n&&!d){var e=c.getElementById(a);return e?e.id===a||typeof e.getAttributeNode!==n&&e.getAttributeNode("id").value===a?[e]:b:[]}},TAG:Y?function(a,b){if(typeof b.getElementsByTagName!==n)return b.getElementsByTagName(a)}:function(a,b){var c=b.getElementsByTagName(a);if(a==="*"){var d,e=[],f=0;for(;d=c[f];f++)d.nodeType===1&&e.push(d);return e}return c},NAME:ba&&function(a,b){if(typeof b.getElementsByName!==n)return b.getElementsByName(name)},CLASS:_&&function(a,b,c){if(typeof b.getElementsByClassName!==n&&!c)return b.getElementsByClassName(a)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(V,""),a[3]=(a[4]||a[5]||"").replace(V,""),a[2]==="~="&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),a[1]==="nth"?(a[2]||bc.error(a[0]),a[3]=+(a[3]?a[4]+(a[5]||1):2*(a[2]==="even"||a[2]==="odd")),a[4]=+(a[6]+a[7]||a[2]==="odd")):a[2]&&bc.error(a[0]),a},PSEUDO:function(a){var b,c;if(W.CHILD.test(a[0]))return null;if(a[3])a[2]=a[3];else if(b=a[4])O.test(b)&&(c=bh(b,!0))&&(c=b.indexOf(")",b.length-c)-b.length)&&(b=b.slice(0,c),a[0]=a[0].slice(0,c)),a[2]=b;return a.slice(0,3)}},filter:{ID:d?function(a){return a=a.replace(V,""),function(b){return b.getAttribute("id")===a}}:function(a){return a=a.replace(V,""),function(b){var c=typeof b.getAttributeNode!==n&&b.getAttributeNode("id");return c&&c.value===a}},TAG:function(a){return a==="*"?function(){return!0}:(a=a.replace(V,"").toLowerCase(),function(b){return b.nodeName&&b.nodeName.toLowerCase()===a})},CLASS:function(a){var b=B[o][a];return b||(b=B(a,new RegExp("(^|"+E+")"+a+"("+E+"|$)"))),function(a){return b.test(a.className||typeof a.getAttribute!==n&&a.getAttribute("class")||"")}},ATTR:function(a,b,c){return function(d,e){var f=bc.attr(d,a);return f==null?b==="!=":b?(f+="",b==="="?f===c:b==="!="?f!==c:b==="^="?c&&f.indexOf(c)===0:b==="*="?c&&f.indexOf(c)>-1:b==="$="?c&&f.substr(f.length-c.length)===c:b==="~="?(" "+f+" ").indexOf(c)>-1:b==="|="?f===c||f.substr(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d){return a==="nth"?function(a){var b,e,f=a.parentNode;if(c===1&&d===0)return!0;if(f){e=0;for(b=f.firstChild;b;b=b.nextSibling)if(b.nodeType===1){e++;if(a===b)break}}return e-=d,e===c||e%c===0&&e/c>=0}:function(b){var c=b;switch(a){case"only":case"first":while(c=c.previousSibling)if(c.nodeType===1)return!1;if(a==="first")return!0;c=b;case"last":while(c=c.nextSibling)if(c.nodeType===1)return!1;return!0}}},PSEUDO:function(a,b){var c,d=e.pseudos[a]||e.setFilters[a.toLowerCase()]||bc.error("unsupported pseudo: "+a);return d[o]?d(b):d.length>1?(c=[a,a,"",b],e.setFilters.hasOwnProperty(a.toLowerCase())?z(function(a,c){var e,f=d(a,b),g=f.length;while(g--)e=y.call(a,f[g]),a[e]=!(c[e]=f[g])}):function(a){return d(a,0,c)}):d}},pseudos:{not:z(function(a){var b=[],c=[],d=i(a.replace(L,"$1"));return d[o]?z(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)if(f=g[h])a[h]=!(b[h]=f)}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:z(function(a){return function(b){return bc(a,b).length>0}}),contains:z(function(a){return function(b){return(b.textContent||b.innerText||f(b)).indexOf(a)>-1}}),enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&!!a.checked||b==="option"&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},parent:function(a){return!e.pseudos.empty(a)},empty:function(a){var b;a=a.firstChild;while(a){if(a.nodeName>"@"||(b=a.nodeType)===3||b===4)return!1;a=a.nextSibling}return!0},header:function(a){return T.test(a.nodeName)},text:function(a){var b,c;return a.nodeName.toLowerCase()==="input"&&(b=a.type)==="text"&&((c=a.getAttribute("type"))==null||c.toLowerCase()===b)},radio:bd("radio"),checkbox:bd("checkbox"),file:bd("file"),password:bd("password"),image:bd("image"),submit:be("submit"),reset:be("reset"),button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&a.type==="button"||b==="button"},input:function(a){return U.test(a.nodeName)},focus:function(a){var b=a.ownerDocument;return a===b.activeElement&&(!b.hasFocus||b.hasFocus())&&(!!a.type||!!a.href)},active:function(a){return a===a.ownerDocument.activeElement},first:bf(function(a,b,c){return[0]}),last:bf(function(a,b,c){return[b-1]}),eq:bf(function(a,b,c){return[c<0?c+b:c]}),even:bf(function(a,b,c){for(var d=0;d<b;d+=2)a.push(d);return a}),odd:bf(function(a,b,c){for(var d=1;d<b;d+=2)a.push(d);return a}),lt:bf(function(a,b,c){for(var d=c<0?c+b:c;--d>=0;)a.push(d);return a}),gt:bf(function(a,b,c){for(var d=c<0?c+b:c;++d<b;)a.push(d);return a})}},j=s.compareDocumentPosition?function(a,b){return a===b?(k=!0,0):(!a.compareDocumentPosition||!b.compareDocumentPosition?a.compareDocumentPosition:a.compareDocumentPosition(b)&4)?-1:1}:function(a,b){if(a===b)return k=!0,0;if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,h=b.parentNode,i=g;if(g===h)return bg(a,b);if(!g)return-1;if(!h)return 1;while(i)e.unshift(i),i=i.parentNode;i=h;while(i)f.unshift(i),i=i.parentNode;c=e.length,d=f.length;for(var j=0;j<c&&j<d;j++)if(e[j]!==f[j])return bg(e[j],f[j]);return j===c?bg(a,f[j],-1):bg(e[j],b,1)},[0,0].sort(j),m=!k,bc.uniqueSort=function(a){var b,c=1;k=m,a.sort(j);if(k)for(;b=a[c];c++)b===a[c-1]&&a.splice(c--,1);return a},bc.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},i=bc.compile=function(a,b){var c,d=[],e=[],f=D[o][a];if(!f){b||(b=bh(a)),c=b.length;while(c--)f=bm(b[c]),f[o]?d.push(f):e.push(f);f=D(a,bn(e,d))}return f},r.querySelectorAll&&function(){var a,b=bp,c=/'|\\/g,d=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,e=[":focus"],f=[":active",":focus"],h=s.matchesSelector||s.mozMatchesSelector||s.webkitMatchesSelector||s.oMatchesSelector||s.msMatchesSelector;X(function(a){a.innerHTML="<select><option selected=''></option></select>",a.querySelectorAll("[selected]").length||e.push("\\["+E+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),a.querySelectorAll(":checked").length||e.push(":checked")}),X(function(a){a.innerHTML="<p test=''></p>",a.querySelectorAll("[test^='']").length&&e.push("[*^$]="+E+"*(?:\"\"|'')"),a.innerHTML="<input type='hidden'/>",a.querySelectorAll(":enabled").length||e.push(":enabled",":disabled")}),e=new RegExp(e.join("|")),bp=function(a,d,f,g,h){if(!g&&!h&&(!e||!e.test(a))){var i,j,k=!0,l=o,m=d,n=d.nodeType===9&&a;if(d.nodeType===1&&d.nodeName.toLowerCase()!=="object"){i=bh(a),(k=d.getAttribute("id"))?l=k.replace(c,"\\$&"):d.setAttribute("id",l),l="[id='"+l+"'] ",j=i.length;while(j--)i[j]=l+i[j].join("");m=R.test(a)&&d.parentNode||d,n=i.join(",")}if(n)try{return w.apply(f,x.call(m.querySelectorAll(n),0)),f}catch(p){}finally{k||d.removeAttribute("id")}}return b(a,d,f,g,h)},h&&(X(function(b){a=h.call(b,"div");try{h.call(b,"[test!='']:sizzle"),f.push("!=",J)}catch(c){}}),f=new RegExp(f.join("|")),bc.matchesSelector=function(b,c){c=c.replace(d,"='$1']");if(!g(b)&&!f.test(c)&&(!e||!e.test(c)))try{var i=h.call(b,c);if(i||a||b.document&&b.document.nodeType!==11)return i}catch(j){}return bc(c,null,null,[b]).length>0})}(),e.pseudos.nth=e.pseudos.eq,e.filters=bq.prototype=e.pseudos,e.setFilters=new bq,bc.attr=p.attr,p.find=bc,p.expr=bc.selectors,p.expr[":"]=p.expr.pseudos,p.unique=bc.uniqueSort,p.text=bc.getText,p.isXMLDoc=bc.isXML,p.contains=bc.contains}(a);var bc=/Until$/,bd=/^(?:parents|prev(?:Until|All))/,be=/^.[^:#\[\.,]*$/,bf=p.expr.match.needsContext,bg={children:!0,contents:!0,next:!0,prev:!0};p.fn.extend({find:function(a){var b,c,d,e,f,g,h=this;if(typeof a!="string")return p(a).filter(function(){for(b=0,c=h.length;b<c;b++)if(p.contains(h[b],this))return!0});g=this.pushStack("","find",a);for(b=0,c=this.length;b<c;b++){d=g.length,p.find(a,this[b],g);if(b>0)for(e=d;e<g.length;e++)for(f=0;f<d;f++)if(g[f]===g[e]){g.splice(e--,1);break}}return g},has:function(a){var b,c=p(a,this),d=c.length;return this.filter(function(){for(b=0;b<d;b++)if(p.contains(this,c[b]))return!0})},not:function(a){return this.pushStack(bj(this,a,!1),"not",a)},filter:function(a){return this.pushStack(bj(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?bf.test(a)?p(a,this.context).index(this[0])>=0:p.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c,d=0,e=this.length,f=[],g=bf.test(a)||typeof a!="string"?p(a,b||this.context):0;for(;d<e;d++){c=this[d];while(c&&c.ownerDocument&&c!==b&&c.nodeType!==11){if(g?g.index(c)>-1:p.find.matchesSelector(c,a)){f.push(c);break}c=c.parentNode}}return f=f.length>1?p.unique(f):f,this.pushStack(f,"closest",a)},index:function(a){return a?typeof a=="string"?p.inArray(this[0],p(a)):p.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(a,b){var c=typeof a=="string"?p(a,b):p.makeArray(a&&a.nodeType?[a]:a),d=p.merge(this.get(),c);return this.pushStack(bh(c[0])||bh(d[0])?d:p.unique(d))},addBack:function(a){return this.add(a==null?this.prevObject:this.prevObject.filter(a))}}),p.fn.andSelf=p.fn.addBack,p.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return p.dir(a,"parentNode")},parentsUntil:function(a,b,c){return p.dir(a,"parentNode",c)},next:function(a){return bi(a,"nextSibling")},prev:function(a){return bi(a,"previousSibling")},nextAll:function(a){return p.dir(a,"nextSibling")},prevAll:function(a){return p.dir(a,"previousSibling")},nextUntil:function(a,b,c){return p.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return p.dir(a,"previousSibling",c)},siblings:function(a){return p.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return p.sibling(a.firstChild)},contents:function(a){return p.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:p.merge([],a.childNodes)}},function(a,b){p.fn[a]=function(c,d){var e=p.map(this,b,c);return bc.test(a)||(d=c),d&&typeof d=="string"&&(e=p.filter(d,e)),e=this.length>1&&!bg[a]?p.unique(e):e,this.length>1&&bd.test(a)&&(e=e.reverse()),this.pushStack(e,a,k.call(arguments).join(","))}}),p.extend({filter:function(a,b,c){return c&&(a=":not("+a+")"),b.length===1?p.find.matchesSelector(b[0],a)?[b[0]]:[]:p.find.matches(a,b)},dir:function(a,c,d){var e=[],f=a[c];while(f&&f.nodeType!==9&&(d===b||f.nodeType!==1||!p(f).is(d)))f.nodeType===1&&e.push(f),f=f[c];return e},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var bl="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",bm=/ jQuery\d+="(?:null|\d+)"/g,bn=/^\s+/,bo=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bp=/<([\w:]+)/,bq=/<tbody/i,br=/<|&#?\w+;/,bs=/<(?:script|style|link)/i,bt=/<(?:script|object|embed|option|style)/i,bu=new RegExp("<(?:"+bl+")[\\s/>]","i"),bv=/^(?:checkbox|radio)$/,bw=/checked\s*(?:[^=]|=\s*.checked.)/i,bx=/\/(java|ecma)script/i,by=/^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,bz={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bA=bk(e),bB=bA.appendChild(e.createElement("div"));bz.optgroup=bz.option,bz.tbody=bz.tfoot=bz.colgroup=bz.caption=bz.thead,bz.th=bz.td,p.support.htmlSerialize||(bz._default=[1,"X<div>","</div>"]),p.fn.extend({text:function(a){return p.access(this,function(a){return a===b?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||e).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(p.isFunction(a))return this.each(function(b){p(this).wrapAll(a.call(this,b))});if(this[0]){var b=p(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return p.isFunction(a)?this.each(function(b){p(this).wrapInner(a.call(this,b))}):this.each(function(){var b=p(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=p.isFunction(a);return this.each(function(c){p(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(a,this.firstChild)})},before:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(a,this),"before",this.selector)}},after:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(this,a),"after",this.selector)}},remove:function(a,b){var c,d=0;for(;(c=this[d])!=null;d++)if(!a||p.filter(a,[c]).length)!b&&c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),p.cleanData([c])),c.parentNode&&c.parentNode.removeChild(c);return this},empty:function(){var a,b=0;for(;(a=this[b])!=null;b++){a.nodeType===1&&p.cleanData(a.getElementsByTagName("*"));while(a.firstChild)a.removeChild(a.firstChild)}return this},clone:function(a,b){return a=a==null?!1:a,b=b==null?a:b,this.map(function(){return p.clone(this,a,b)})},html:function(a){return p.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(bm,""):b;if(typeof a=="string"&&!bs.test(a)&&(p.support.htmlSerialize||!bu.test(a))&&(p.support.leadingWhitespace||!bn.test(a))&&!bz[(bp.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(bo,"<$1></$2>");try{for(;d<e;d++)c=this[d]||{},c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),c.innerHTML=a);c=0}catch(f){}}c&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(a){return bh(this[0])?this.length?this.pushStack(p(p.isFunction(a)?a():a),"replaceWith",a):this:p.isFunction(a)?this.each(function(b){var c=p(this),d=c.html();c.replaceWith(a.call(this,b,d))}):(typeof a!="string"&&(a=p(a).detach()),this.each(function(){var b=this.nextSibling,c=this.parentNode;p(this).remove(),b?p(b).before(a):p(c).append(a)}))},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){a=[].concat.apply([],a);var e,f,g,h,i=0,j=a[0],k=[],l=this.length;if(!p.support.checkClone&&l>1&&typeof j=="string"&&bw.test(j))return this.each(function(){p(this).domManip(a,c,d)});if(p.isFunction(j))return this.each(function(e){var f=p(this);a[0]=j.call(this,e,c?f.html():b),f.domManip(a,c,d)});if(this[0]){e=p.buildFragment(a,this,k),g=e.fragment,f=g.firstChild,g.childNodes.length===1&&(g=f);if(f){c=c&&p.nodeName(f,"tr");for(h=e.cacheable||l-1;i<l;i++)d.call(c&&p.nodeName(this[i],"table")?bC(this[i],"tbody"):this[i],i===h?g:p.clone(g,!0,!0))}g=f=null,k.length&&p.each(k,function(a,b){b.src?p.ajax?p.ajax({url:b.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):p.error("no ajax"):p.globalEval((b.text||b.textContent||b.innerHTML||"").replace(by,"")),b.parentNode&&b.parentNode.removeChild(b)})}return this}}),p.buildFragment=function(a,c,d){var f,g,h,i=a[0];return c=c||e,c=!c.nodeType&&c[0]||c,c=c.ownerDocument||c,a.length===1&&typeof i=="string"&&i.length<512&&c===e&&i.charAt(0)==="<"&&!bt.test(i)&&(p.support.checkClone||!bw.test(i))&&(p.support.html5Clone||!bu.test(i))&&(g=!0,f=p.fragments[i],h=f!==b),f||(f=c.createDocumentFragment(),p.clean(a,c,f,d),g&&(p.fragments[i]=h&&f)),{fragment:f,cacheable:g}},p.fragments={},p.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){p.fn[a]=function(c){var d,e=0,f=[],g=p(c),h=g.length,i=this.length===1&&this[0].parentNode;if((i==null||i&&i.nodeType===11&&i.childNodes.length===1)&&h===1)return g[b](this[0]),this;for(;e<h;e++)d=(e>0?this.clone(!0):this).get(),p(g[e])[b](d),f=f.concat(d);return this.pushStack(f,a,g.selector)}}),p.extend({clone:function(a,b,c){var d,e,f,g;p.support.html5Clone||p.isXMLDoc(a)||!bu.test("<"+a.nodeName+">")?g=a.cloneNode(!0):(bB.innerHTML=a.outerHTML,bB.removeChild(g=bB.firstChild));if((!p.support.noCloneEvent||!p.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!p.isXMLDoc(a)){bE(a,g),d=bF(a),e=bF(g);for(f=0;d[f];++f)e[f]&&bE(d[f],e[f])}if(b){bD(a,g);if(c){d=bF(a),e=bF(g);for(f=0;d[f];++f)bD(d[f],e[f])}}return d=e=null,g},clean:function(a,b,c,d){var f,g,h,i,j,k,l,m,n,o,q,r,s=b===e&&bA,t=[];if(!b||typeof b.createDocumentFragment=="undefined")b=e;for(f=0;(h=a[f])!=null;f++){typeof h=="number"&&(h+="");if(!h)continue;if(typeof h=="string")if(!br.test(h))h=b.createTextNode(h);else{s=s||bk(b),l=b.createElement("div"),s.appendChild(l),h=h.replace(bo,"<$1></$2>"),i=(bp.exec(h)||["",""])[1].toLowerCase(),j=bz[i]||bz._default,k=j[0],l.innerHTML=j[1]+h+j[2];while(k--)l=l.lastChild;if(!p.support.tbody){m=bq.test(h),n=i==="table"&&!m?l.firstChild&&l.firstChild.childNodes:j[1]==="<table>"&&!m?l.childNodes:[];for(g=n.length-1;g>=0;--g)p.nodeName(n[g],"tbody")&&!n[g].childNodes.length&&n[g].parentNode.removeChild(n[g])}!p.support.leadingWhitespace&&bn.test(h)&&l.insertBefore(b.createTextNode(bn.exec(h)[0]),l.firstChild),h=l.childNodes,l.parentNode.removeChild(l)}h.nodeType?t.push(h):p.merge(t,h)}l&&(h=l=s=null);if(!p.support.appendChecked)for(f=0;(h=t[f])!=null;f++)p.nodeName(h,"input")?bG(h):typeof h.getElementsByTagName!="undefined"&&p.grep(h.getElementsByTagName("input"),bG);if(c){q=function(a){if(!a.type||bx.test(a.type))return d?d.push(a.parentNode?a.parentNode.removeChild(a):a):c.appendChild(a)};for(f=0;(h=t[f])!=null;f++)if(!p.nodeName(h,"script")||!q(h))c.appendChild(h),typeof h.getElementsByTagName!="undefined"&&(r=p.grep(p.merge([],h.getElementsByTagName("script")),q),t.splice.apply(t,[f+1,0].concat(r)),f+=r.length)}return t},cleanData:function(a,b){var c,d,e,f,g=0,h=p.expando,i=p.cache,j=p.support.deleteExpando,k=p.event.special;for(;(e=a[g])!=null;g++)if(b||p.acceptData(e)){d=e[h],c=d&&i[d];if(c){if(c.events)for(f in c.events)k[f]?p.event.remove(e,f):p.removeEvent(e,f,c.handle);i[d]&&(delete i[d],j?delete e[h]:e.removeAttribute?e.removeAttribute(h):e[h]=null,p.deletedIds.push(d))}}}}),function(){var a,b;p.uaMatch=function(a){a=a.toLowerCase();var b=/(chrome)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},a=p.uaMatch(g.userAgent),b={},a.browser&&(b[a.browser]=!0,b.version=a.version),b.chrome?b.webkit=!0:b.webkit&&(b.safari=!0),p.browser=b,p.sub=function(){function a(b,c){return new a.fn.init(b,c)}p.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function c(c,d){return d&&d instanceof p&&!(d instanceof a)&&(d=a(d)),p.fn.init.call(this,c,d,b)},a.fn.init.prototype=a.fn;var b=a(e);return a}}();var bH,bI,bJ,bK=/alpha\([^)]*\)/i,bL=/opacity=([^)]*)/,bM=/^(top|right|bottom|left)$/,bN=/^(none|table(?!-c[ea]).+)/,bO=/^margin/,bP=new RegExp("^("+q+")(.*)$","i"),bQ=new RegExp("^("+q+")(?!px)[a-z%]+$","i"),bR=new RegExp("^([-+])=("+q+")","i"),bS={},bT={position:"absolute",visibility:"hidden",display:"block"},bU={letterSpacing:0,fontWeight:400},bV=["Top","Right","Bottom","Left"],bW=["Webkit","O","Moz","ms"],bX=p.fn.toggle;p.fn.extend({css:function(a,c){return p.access(this,function(a,c,d){return d!==b?p.style(a,c,d):p.css(a,c)},a,c,arguments.length>1)},show:function(){return b$(this,!0)},hide:function(){return b$(this)},toggle:function(a,b){var c=typeof a=="boolean";return p.isFunction(a)&&p.isFunction(b)?bX.apply(this,arguments):this.each(function(){(c?a:bZ(this))?p(this).show():p(this).hide()})}}),p.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bH(a,"opacity");return c===""?"1":c}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":p.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!a||a.nodeType===3||a.nodeType===8||!a.style)return;var f,g,h,i=p.camelCase(c),j=a.style;c=p.cssProps[i]||(p.cssProps[i]=bY(j,i)),h=p.cssHooks[c]||p.cssHooks[i];if(d===b)return h&&"get"in h&&(f=h.get(a,!1,e))!==b?f:j[c];g=typeof d,g==="string"&&(f=bR.exec(d))&&(d=(f[1]+1)*f[2]+parseFloat(p.css(a,c)),g="number");if(d==null||g==="number"&&isNaN(d))return;g==="number"&&!p.cssNumber[i]&&(d+="px");if(!h||!("set"in h)||(d=h.set(a,d,e))!==b)try{j[c]=d}catch(k){}},css:function(a,c,d,e){var f,g,h,i=p.camelCase(c);return c=p.cssProps[i]||(p.cssProps[i]=bY(a.style,i)),h=p.cssHooks[c]||p.cssHooks[i],h&&"get"in h&&(f=h.get(a,!0,e)),f===b&&(f=bH(a,c)),f==="normal"&&c in bU&&(f=bU[c]),d||e!==b?(g=parseFloat(f),d||p.isNumeric(g)?g||0:f):f},swap:function(a,b,c){var d,e,f={};for(e in b)f[e]=a.style[e],a.style[e]=b[e];d=c.call(a);for(e in b)a.style[e]=f[e];return d}}),a.getComputedStyle?bH=function(b,c){var d,e,f,g,h=a.getComputedStyle(b,null),i=b.style;return h&&(d=h[c],d===""&&!p.contains(b.ownerDocument,b)&&(d=p.style(b,c)),bQ.test(d)&&bO.test(c)&&(e=i.width,f=i.minWidth,g=i.maxWidth,i.minWidth=i.maxWidth=i.width=d,d=h.width,i.width=e,i.minWidth=f,i.maxWidth=g)),d}:e.documentElement.currentStyle&&(bH=function(a,b){var c,d,e=a.currentStyle&&a.currentStyle[b],f=a.style;return e==null&&f&&f[b]&&(e=f[b]),bQ.test(e)&&!bM.test(b)&&(c=f.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":e,e=f.pixelLeft+"px",f.left=c,d&&(a.runtimeStyle.left=d)),e===""?"auto":e}),p.each(["height","width"],function(a,b){p.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth===0&&bN.test(bH(a,"display"))?p.swap(a,bT,function(){return cb(a,b,d)}):cb(a,b,d)},set:function(a,c,d){return b_(a,c,d?ca(a,b,d,p.support.boxSizing&&p.css(a,"boxSizing")==="border-box"):0)}}}),p.support.opacity||(p.cssHooks.opacity={get:function(a,b){return bL.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=p.isNumeric(b)?"alpha(opacity="+b*100+")":"",f=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&p.trim(f.replace(bK,""))===""&&c.removeAttribute){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bK.test(f)?f.replace(bK,e):f+" "+e}}),p(function(){p.support.reliableMarginRight||(p.cssHooks.marginRight={get:function(a,b){return p.swap(a,{display:"inline-block"},function(){if(b)return bH(a,"marginRight")})}}),!p.support.pixelPosition&&p.fn.position&&p.each(["top","left"],function(a,b){p.cssHooks[b]={get:function(a,c){if(c){var d=bH(a,b);return bQ.test(d)?p(a).position()[b]+"px":d}}}})}),p.expr&&p.expr.filters&&(p.expr.filters.hidden=function(a){return a.offsetWidth===0&&a.offsetHeight===0||!p.support.reliableHiddenOffsets&&(a.style&&a.style.display||bH(a,"display"))==="none"},p.expr.filters.visible=function(a){return!p.expr.filters.hidden(a)}),p.each({margin:"",padding:"",border:"Width"},function(a,b){p.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bV[d]+b]=e[d]||e[d-2]||e[0];return f}},bO.test(a)||(p.cssHooks[a+b].set=b_)});var cd=/%20/g,ce=/\[\]$/,cf=/\r?\n/g,cg=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,ch=/^(?:select|textarea)/i;p.fn.extend({serialize:function(){return p.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?p.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ch.test(this.nodeName)||cg.test(this.type))}).map(function(a,b){var c=p(this).val();return c==null?null:p.isArray(c)?p.map(c,function(a,c){return{name:b.name,value:a.replace(cf,"\r\n")}}):{name:b.name,value:c.replace(cf,"\r\n")}}).get()}}),p.param=function(a,c){var d,e=[],f=function(a,b){b=p.isFunction(b)?b():b==null?"":b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=p.ajaxSettings&&p.ajaxSettings.traditional);if(p.isArray(a)||a.jquery&&!p.isPlainObject(a))p.each(a,function(){f(this.name,this.value)});else for(d in a)ci(d,a[d],c,f);return e.join("&").replace(cd,"+")};var cj,ck,cl=/#.*$/,cm=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,cn=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,co=/^(?:GET|HEAD)$/,cp=/^\/\//,cq=/\?/,cr=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,cs=/([?&])_=[^&]*/,ct=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,cu=p.fn.load,cv={},cw={},cx=["*/"]+["*"];try{ck=f.href}catch(cy){ck=e.createElement("a"),ck.href="",ck=ck.href}cj=ct.exec(ck.toLowerCase())||[],p.fn.load=function(a,c,d){if(typeof a!="string"&&cu)return cu.apply(this,arguments);if(!this.length)return this;var e,f,g,h=this,i=a.indexOf(" ");return i>=0&&(e=a.slice(i,a.length),a=a.slice(0,i)),p.isFunction(c)?(d=c,c=b):c&&typeof c=="object"&&(f="POST"),p.ajax({url:a,type:f,dataType:"html",data:c,complete:function(a,b){d&&h.each(d,g||[a.responseText,b,a])}}).done(function(a){g=arguments,h.html(e?p("<div>").append(a.replace(cr,"")).find(e):a)}),this},p.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){p.fn[b]=function(a){return this.on(b,a)}}),p.each(["get","post"],function(a,c){p[c]=function(a,d,e,f){return p.isFunction(d)&&(f=f||e,e=d,d=b),p.ajax({type:c,url:a,data:d,success:e,dataType:f})}}),p.extend({getScript:function(a,c){return p.get(a,b,c,"script")},getJSON:function(a,b,c){return p.get(a,b,c,"json")},ajaxSetup:function(a,b){return b?cB(a,p.ajaxSettings):(b=a,a=p.ajaxSettings),cB(a,b),a},ajaxSettings:{url:ck,isLocal:cn.test(cj[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":cx},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":p.parseJSON,"text xml":p.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:cz(cv),ajaxTransport:cz(cw),ajax:function(a,c){function y(a,c,f,i){var k,s,t,u,w,y=c;if(v===2)return;v=2,h&&clearTimeout(h),g=b,e=i||"",x.readyState=a>0?4:0,f&&(u=cC(l,x,f));if(a>=200&&a<300||a===304)l.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(p.lastModified[d]=w),w=x.getResponseHeader("Etag"),w&&(p.etag[d]=w)),a===304?(y="notmodified",k=!0):(k=cD(l,u),y=k.state,s=k.data,t=k.error,k=!t);else{t=y;if(!y||a)y="error",a<0&&(a=0)}x.status=a,x.statusText=(c||y)+"",k?o.resolveWith(m,[s,y,x]):o.rejectWith(m,[x,y,t]),x.statusCode(r),r=b,j&&n.trigger("ajax"+(k?"Success":"Error"),[x,l,k?s:t]),q.fireWith(m,[x,y]),j&&(n.trigger("ajaxComplete",[x,l]),--p.active||p.event.trigger("ajaxStop"))}typeof a=="object"&&(c=a,a=b),c=c||{};var d,e,f,g,h,i,j,k,l=p.ajaxSetup({},c),m=l.context||l,n=m!==l&&(m.nodeType||m instanceof p)?p(m):p.event,o=p.Deferred(),q=p.Callbacks("once memory"),r=l.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,setRequestHeader:function(a,b){if(!v){var c=a.toLowerCase();a=u[c]=u[c]||a,t[a]=b}return this},getAllResponseHeaders:function(){return v===2?e:null},getResponseHeader:function(a){var c;if(v===2){if(!f){f={};while(c=cm.exec(e))f[c[1].toLowerCase()]=c[2]}c=f[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){return v||(l.mimeType=a),this},abort:function(a){return a=a||w,g&&g.abort(a),y(0,a),this}};o.promise(x),x.success=x.done,x.error=x.fail,x.complete=q.add,x.statusCode=function(a){if(a){var b;if(v<2)for(b in a)r[b]=[r[b],a[b]];else b=a[x.status],x.always(b)}return this},l.url=((a||l.url)+"").replace(cl,"").replace(cp,cj[1]+"//"),l.dataTypes=p.trim(l.dataType||"*").toLowerCase().split(s),l.crossDomain==null&&(i=ct.exec(l.url.toLowerCase())||!1,l.crossDomain=i&&i.join(":")+(i[3]?"":i[1]==="http:"?80:443)!==cj.join(":")+(cj[3]?"":cj[1]==="http:"?80:443)),l.data&&l.processData&&typeof l.data!="string"&&(l.data=p.param(l.data,l.traditional)),cA(cv,l,c,x);if(v===2)return x;j=l.global,l.type=l.type.toUpperCase(),l.hasContent=!co.test(l.type),j&&p.active++===0&&p.event.trigger("ajaxStart");if(!l.hasContent){l.data&&(l.url+=(cq.test(l.url)?"&":"?")+l.data,delete l.data),d=l.url;if(l.cache===!1){var z=p.now(),A=l.url.replace(cs,"$1_="+z);l.url=A+(A===l.url?(cq.test(l.url)?"&":"?")+"_="+z:"")}}(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",l.contentType),l.ifModified&&(d=d||l.url,p.lastModified[d]&&x.setRequestHeader("If-Modified-Since",p.lastModified[d]),p.etag[d]&&x.setRequestHeader("If-None-Match",p.etag[d])),x.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+(l.dataTypes[0]!=="*"?", "+cx+"; q=0.01":""):l.accepts["*"]);for(k in l.headers)x.setRequestHeader(k,l.headers[k]);if(!l.beforeSend||l.beforeSend.call(m,x,l)!==!1&&v!==2){w="abort";for(k in{success:1,error:1,complete:1})x[k](l[k]);g=cA(cw,l,c,x);if(!g)y(-1,"No Transport");else{x.readyState=1,j&&n.trigger("ajaxSend",[x,l]),l.async&&l.timeout>0&&(h=setTimeout(function(){x.abort("timeout")},l.timeout));try{v=1,g.send(t,y)}catch(B){if(v<2)y(-1,B);else throw B}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var cE=[],cF=/\?/,cG=/(=)\?(?=&|$)|\?\?/,cH=p.now();p.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=cE.pop()||p.expando+"_"+cH++;return this[a]=!0,a}}),p.ajaxPrefilter("json jsonp",function(c,d,e){var f,g,h,i=c.data,j=c.url,k=c.jsonp!==!1,l=k&&cG.test(j),m=k&&!l&&typeof i=="string"&&!(c.contentType||"").indexOf("application/x-www-form-urlencoded")&&cG.test(i);if(c.dataTypes[0]==="jsonp"||l||m)return f=c.jsonpCallback=p.isFunction(c.jsonpCallback)?c.jsonpCallback():c.jsonpCallback,g=a[f],l?c.url=j.replace(cG,"$1"+f):m?c.data=i.replace(cG,"$1"+f):k&&(c.url+=(cF.test(j)?"&":"?")+c.jsonp+"="+f),c.converters["script json"]=function(){return h||p.error(f+" was not called"),h[0]},c.dataTypes[0]="json",a[f]=function(){h=arguments},e.always(function(){a[f]=g,c[f]&&(c.jsonpCallback=d.jsonpCallback,cE.push(f)),h&&p.isFunction(g)&&g(h[0]),h=g=b}),"script"}),p.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){return p.globalEval(a),a}}}),p.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),p.ajaxTransport("script",function(a){if(a.crossDomain){var c,d=e.head||e.getElementsByTagName("head")[0]||e.documentElement;return{send:function(f,g){c=e.createElement("script"),c.async="async",a.scriptCharset&&(c.charset=a.scriptCharset),c.src=a.url,c.onload=c.onreadystatechange=function(a,e){if(e||!c.readyState||/loaded|complete/.test(c.readyState))c.onload=c.onreadystatechange=null,d&&c.parentNode&&d.removeChild(c),c=b,e||g(200,"success")},d.insertBefore(c,d.firstChild)},abort:function(){c&&c.onload(0,1)}}}});var cI,cJ=a.ActiveXObject?function(){for(var a in cI)cI[a](0,1)}:!1,cK=0;p.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&cL()||cM()}:cL,function(a){p.extend(p.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(p.ajaxSettings.xhr()),p.support.ajax&&p.ajaxTransport(function(c){if(!c.crossDomain||p.support.cors){var d;return{send:function(e,f){var g,h,i=c.xhr();c.username?i.open(c.type,c.url,c.async,c.username,c.password):i.open(c.type,c.url,c.async);if(c.xhrFields)for(h in c.xhrFields)i[h]=c.xhrFields[h];c.mimeType&&i.overrideMimeType&&i.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(h in e)i.setRequestHeader(h,e[h])}catch(j){}i.send(c.hasContent&&c.data||null),d=function(a,e){var h,j,k,l,m;try{if(d&&(e||i.readyState===4)){d=b,g&&(i.onreadystatechange=p.noop,cJ&&delete cI[g]);if(e)i.readyState!==4&&i.abort();else{h=i.status,k=i.getAllResponseHeaders(),l={},m=i.responseXML,m&&m.documentElement&&(l.xml=m);try{l.text=i.responseText}catch(a){}try{j=i.statusText}catch(n){j=""}!h&&c.isLocal&&!c.crossDomain?h=l.text?200:404:h===1223&&(h=204)}}}catch(o){e||f(-1,o)}l&&f(h,j,l,k)},c.async?i.readyState===4?setTimeout(d,0):(g=++cK,cJ&&(cI||(cI={},p(a).unload(cJ)),cI[g]=d),i.onreadystatechange=d):d()},abort:function(){d&&d(0,1)}}}});var cN,cO,cP=/^(?:toggle|show|hide)$/,cQ=new RegExp("^(?:([-+])=|)("+q+")([a-z%]*)$","i"),cR=/queueHooks$/,cS=[cY],cT={"*":[function(a,b){var c,d,e=this.createTween(a,b),f=cQ.exec(b),g=e.cur(),h=+g||0,i=1,j=20;if(f){c=+f[2],d=f[3]||(p.cssNumber[a]?"":"px");if(d!=="px"&&h){h=p.css(e.elem,a,!0)||c||1;do i=i||".5",h=h/i,p.style(e.elem,a,h+d);while(i!==(i=e.cur()/g)&&i!==1&&--j)}e.unit=d,e.start=h,e.end=f[1]?h+(f[1]+1)*c:c}return e}]};p.Animation=p.extend(cW,{tweener:function(a,b){p.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");var c,d=0,e=a.length;for(;d<e;d++)c=a[d],cT[c]=cT[c]||[],cT[c].unshift(b)},prefilter:function(a,b){b?cS.unshift(a):cS.push(a)}}),p.Tween=cZ,cZ.prototype={constructor:cZ,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(p.cssNumber[c]?"":"px")},cur:function(){var a=cZ.propHooks[this.prop];return a&&a.get?a.get(this):cZ.propHooks._default.get(this)},run:function(a){var b,c=cZ.propHooks[this.prop];return this.options.duration?this.pos=b=p.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):cZ.propHooks._default.set(this),this}},cZ.prototype.init.prototype=cZ.prototype,cZ.propHooks={_default:{get:function(a){var b;return a.elem[a.prop]==null||!!a.elem.style&&a.elem.style[a.prop]!=null?(b=p.css(a.elem,a.prop,!1,""),!b||b==="auto"?0:b):a.elem[a.prop]},set:function(a){p.fx.step[a.prop]?p.fx.step[a.prop](a):a.elem.style&&(a.elem.style[p.cssProps[a.prop]]!=null||p.cssHooks[a.prop])?p.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},cZ.propHooks.scrollTop=cZ.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},p.each(["toggle","show","hide"],function(a,b){var c=p.fn[b];p.fn[b]=function(d,e,f){return d==null||typeof d=="boolean"||!a&&p.isFunction(d)&&p.isFunction(e)?c.apply(this,arguments):this.animate(c$(b,!0),d,e,f)}}),p.fn.extend({fadeTo:function(a,b,c,d){return this.filter(bZ).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=p.isEmptyObject(a),f=p.speed(b,c,d),g=function(){var b=cW(this,p.extend({},a),f);e&&b.stop(!0)};return e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,c,d){var e=function(a){var b=a.stop;delete a.stop,b(d)};return typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,c=a!=null&&a+"queueHooks",f=p.timers,g=p._data(this);if(c)g[c]&&g[c].stop&&e(g[c]);else for(c in g)g[c]&&g[c].stop&&cR.test(c)&&e(g[c]);for(c=f.length;c--;)f[c].elem===this&&(a==null||f[c].queue===a)&&(f[c].anim.stop(d),b=!1,f.splice(c,1));(b||!d)&&p.dequeue(this,a)})}}),p.each({slideDown:c$("show"),slideUp:c$("hide"),slideToggle:c$("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){p.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),p.speed=function(a,b,c){var d=a&&typeof a=="object"?p.extend({},a):{complete:c||!c&&b||p.isFunction(a)&&a,duration:a,easing:c&&b||b&&!p.isFunction(b)&&b};d.duration=p.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in p.fx.speeds?p.fx.speeds[d.duration]:p.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";return d.old=d.complete,d.complete=function(){p.isFunction(d.old)&&d.old.call(this),d.queue&&p.dequeue(this,d.queue)},d},p.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},p.timers=[],p.fx=cZ.prototype.init,p.fx.tick=function(){var a,b=p.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||p.fx.stop()},p.fx.timer=function(a){a()&&p.timers.push(a)&&!cO&&(cO=setInterval(p.fx.tick,p.fx.interval))},p.fx.interval=13,p.fx.stop=function(){clearInterval(cO),cO=null},p.fx.speeds={slow:600,fast:200,_default:400},p.fx.step={},p.expr&&p.expr.filters&&(p.expr.filters.animated=function(a){return p.grep(p.timers,function(b){return a===b.elem}).length});var c_=/^(?:body|html)$/i;p.fn.offset=function(a){if(arguments.length)return a===b?this:this.each(function(b){p.offset.setOffset(this,a,b)});var c,d,e,f,g,h,i,j={top:0,left:0},k=this[0],l=k&&k.ownerDocument;if(!l)return;return(d=l.body)===k?p.offset.bodyOffset(k):(c=l.documentElement,p.contains(c,k)?(typeof k.getBoundingClientRect!="undefined"&&(j=k.getBoundingClientRect()),e=da(l),f=c.clientTop||d.clientTop||0,g=c.clientLeft||d.clientLeft||0,h=e.pageYOffset||c.scrollTop,i=e.pageXOffset||c.scrollLeft,{top:j.top+h-f,left:j.left+i-g}):j)},p.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;return p.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(p.css(a,"marginTop"))||0,c+=parseFloat(p.css(a,"marginLeft"))||0),{top:b,left:c}},setOffset:function(a,b,c){var d=p.css(a,"position");d==="static"&&(a.style.position="relative");var e=p(a),f=e.offset(),g=p.css(a,"top"),h=p.css(a,"left"),i=(d==="absolute"||d==="fixed")&&p.inArray("auto",[g,h])>-1,j={},k={},l,m;i?(k=e.position(),l=k.top,m=k.left):(l=parseFloat(g)||0,m=parseFloat(h)||0),p.isFunction(b)&&(b=b.call(a,c,f)),b.top!=null&&(j.top=b.top-f.top+l),b.left!=null&&(j.left=b.left-f.left+m),"using"in b?b.using.call(a,j):e.css(j)}},p.fn.extend({position:function(){if(!this[0])return;var a=this[0],b=this.offsetParent(),c=this.offset(),d=c_.test(b[0].nodeName)?{top:0,left:0}:b.offset();return c.top-=parseFloat(p.css(a,"marginTop"))||0,c.left-=parseFloat(p.css(a,"marginLeft"))||0,d.top+=parseFloat(p.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(p.css(b[0],"borderLeftWidth"))||0,{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||e.body;while(a&&!c_.test(a.nodeName)&&p.css(a,"position")==="static")a=a.offsetParent;return a||e.body})}}),p.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);p.fn[a]=function(e){return p.access(this,function(a,e,f){var g=da(a);if(f===b)return g?c in g?g[c]:g.document.documentElement[e]:a[e];g?g.scrollTo(d?p(g).scrollLeft():f,d?f:p(g).scrollTop()):a[e]=f},a,e,arguments.length,null)}}),p.each({Height:"height",Width:"width"},function(a,c){p.each({padding:"inner"+a,content:c,"":"outer"+a},function(d,e){p.fn[e]=function(e,f){var g=arguments.length&&(d||typeof e!="boolean"),h=d||(e===!0||f===!0?"margin":"border");return p.access(this,function(c,d,e){var f;return p.isWindow(c)?c.document.documentElement["client"+a]:c.nodeType===9?(f=c.documentElement,Math.max(c.body["scroll"+a],f["scroll"+a],c.body["offset"+a],f["offset"+a],f["client"+a])):e===b?p.css(c,d,e,h):p.style(c,d,e,h)},c,g?e:b,g,null)}})}),a.jQuery=a.$=p,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return p})})(window);
\ No newline at end of file
diff --git a/htdocs/webiopi.css b/htdocs/webiopi.css
new file mode 100644
index 0000000..40b1163
--- /dev/null
+++ b/htdocs/webiopi.css
@@ -0,0 +1,93 @@
+@CHARSET "UTF-8";
+
+button {
+        -webkit-appearance: none;
+        font-size: 14pt;
+        font-weight: bold;
+        color: white;
+        border: black 3px solid;
+        width: 40px;
+        height: 30px;
+        padding: 0 0 0 0;
+}
+
+input[type="range"] {
+        -webkit-appearance: slider-horizontal;
+}
+
+.Default {
+        background-color: Gray;
+}
+
+.Default:active {
+        background-color: Silver;
+}
+
+.DNC {
+        background-color: Gray;
+}
+
+.GND {
+        background-color: Black;
+}
+
+.V33 {
+        background-color: Orange;
+}
+
+.V50 {
+        background-color: Red;
+}
+
+.LOW {
+        background-color: Black;
+}
+
+.HIGH {
+        background-color: Orange;
+}
+
+.I2C {
+        background-color: LightBlue;
+}
+
+.SPI {
+        background-color: Purple;
+}
+
+.UART {
+        background-color: DarkBlue;
+}
+
+.ONEWIRE {
+        background-color: Blue;
+}
+
+.FunctionBasic {
+        width: 60px;
+        background-color: Gray;
+}
+
+.FunctionSpecial {
+        width: 60px;
+        visibility: hidden;
+}
+
+.Description {
+        font-size: 12pt;
+        font-weight: bold;
+        width: 90px;
+}
+
+#update {
+        position: absolute;
+        top: 16px;
+        right: 12px;
+}
+
+#update > a {
+        font-family: sans-serif;
+        font-size: 12pt;
+        font-weight: bold;
+        color: FireBrick;
+}
diff --git a/htdocs/webiopi.js b/htdocs/webiopi.js
new file mode 100644
index 0000000..c7eae66
--- /dev/null
+++ b/htdocs/webiopi.js
@@ -0,0 +1,1448 @@
+/*

+   Copyright 2012-2013 Eric Ptak - trouch.com

+

+   Licensed under the Apache License, Version 2.0 (the "License");

+   you may not use this file except in compliance with the License.

+   You may obtain a copy of the License at

+

+       http://www.apache.org/licenses/LICENSE-2.0

+

+   Unless required by applicable law or agreed to in writing, software

+   distributed under the License is distributed on an "AS IS" BASIS,

+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+   See the License for the specific language governing permissions and

+   limitations under the License.

+*/

+

+var _gaq = _gaq || [];

+var _webiopi;

+

+function w() {

+        if (_webiopi == undefined) {

+                _webiopi = new WebIOPi();

+        }

+        

+        return _webiopi;

+}

+

+function webiopi() {

+        return w();

+}

+

+function isMobileUserAgent(a) {

+        if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4)))

+                        return true

+}

+

+var _isMobile = undefined;

+function isMobile() {

+        if (_isMobile == undefined) {

+                _isMobile = ((navigator.userAgent != undefined && isMobileUserAgent(navigator.userAgent))

+                                || (navigator.vendor != undefined && isMobileUserAgent(navigator.vendor)) 

+                                || (window.opera != undefined && isMobileUserAgent(window.opera)))

+        }

+        return _isMobile

+}

+

+function WebIOPi() {

+        this.readyCallback = null;

+        this.context = "/";

+        this.GPIO = Array(54);

+        this.PINS = Array(27);

+

+        this.TYPE = {

+                        DNC: {value: 0, style: "DNC", label: "--"},

+                        GND: {value: 1, style: "GND", label: "GROUND"},

+                        V33: {value: 2, style: "V33", label: "3.3V"},

+                        V50: {value: 3, style: "V50", label: "5.0V"},

+                        GPIO: {value: 4, style: "GPIO", label: "GPIO"}

+        };

+        

+        this.ALT = {

+                        I2C: {name: "I2C", enabled: false, gpios: []},

+                        SPI: {name: "SPI", enabled: false, gpios: []},

+                        UART: {name: "UART", enabled: false, gpios: []},

+                        ONEWIRE: {name: "ONEWIRE", enabled: false, gpios: []}

+                };

+                

+        // init GPIOs

+        for (var i=0; i<this.GPIO.length; i++) {

+                var gpio = Object();

+                gpio.value = 0;

+                gpio.func = "IN";

+                gpio.mapped = false;

+                this.GPIO[i] = gpio;

+        }

+

+        // get context

+        var reg = new RegExp("http://" + window.location.host + "(.*)webiopi.js");

+        var scripts = document.getElementsByTagName("script");

+        for(var i = 0; i < scripts.length; i++) {

+                var res = reg.exec(scripts[i].src);

+                if (res && (res.length > 1)) {

+                        script = scripts[i];

+                        this.context = res[1];

+                        

+                }

+        }

+

+        var head = document.getElementsByTagName('head')[0];

+

+        var jquery = document.createElement('script');

+        jquery.type = 'text/javascript';

+        jquery.src = '/jquery.js';

+        if (!isMobile()) {

+                jquery.onload = function() {

+                        w().init();

+                };

+        }

+        head.appendChild(jquery);

+

+        if (isMobile()) {

+                console.log("load jquery mobile");

+                var mobile = document.createElement('script');

+                mobile.type = 'text/javascript';

+                mobile.src = '/jquery-mobile.js';

+                mobile.onload = function() {

+                        w().initMobile()

+                };

+                head.appendChild(mobile);

+        }

+

+        // GA

+        _gaq.push(['_setAccount', 'UA-33979593-2']);

+        _gaq.push(['_trackPageview']);

+                

+        var ga = document.createElement('script');

+        ga.type = 'text/javascript';

+        ga.async = false;

+        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';

+        head.appendChild(ga);

+        

+        var style = document.createElement('link');

+        style.rel = "stylesheet";

+        style.type = 'text/css';

+        style.href = '/webiopi.css';

+        head.appendChild(style);

+

+        if (isMobile()) {

+                var style = document.createElement('link');

+                style.rel = "stylesheet";

+                style.type = 'text/css';

+                style.href = '/jquery-mobile.css';

+                head.appendChild(style);

+        }

+        

+        // init ALTs

+        this.addALT(this.ALT.I2C, 0, "SDA");

+        this.addALT(this.ALT.I2C, 1, "SCL");

+        this.addALT(this.ALT.I2C, 2, "SDA");

+        this.addALT(this.ALT.I2C, 3, "SCL");

+

+        this.addALT(this.ALT.SPI,  7, "CE1");

+        this.addALT(this.ALT.SPI,  8, "CE0");

+        this.addALT(this.ALT.SPI,  9, "MISO");

+        this.addALT(this.ALT.SPI, 10, "MOSI");

+        this.addALT(this.ALT.SPI, 11, "SCLK");

+        

+        this.addALT(this.ALT.UART, 14, "TX");

+        this.addALT(this.ALT.UART, 15, "RX");

+        

+        this.addALT(this.ALT.ONEWIRE, 4, "");

+}

+

+WebIOPi.prototype.init = function() {

+        $.getJSON(w().context + "map", function(data) {

+                var count = w().PINS.length;

+                for (i = 0; i<count-1; i++) {

+                        var type = w().TYPE.GPIO;

+                        var label = data[i];

+                        

+                        if (label == "DNC") {

+                                type = w().TYPE.DNC;

+                        }

+                        else if (label == "GND") {

+                                type = w().TYPE.GND;

+                        }

+                        else if (label == "V33") {

+                                type = w().TYPE.V33;

+                        }

+                        else if (label == "V50") {

+                                type = w().TYPE.V50;

+                        }

+                        

+                        if (type.value != w().TYPE.GPIO.value) {

+                                label = type.label;

+                        }

+                        

+                        w().map(i+1, type, label);

+                }

+                if (w().readyCallback != null) {

+                        w().readyCallback();

+                }

+

+                w().checkVersion();

+        });

+}

+

+WebIOPi.prototype.initMobile = function() {

+        webiopi().init();

+}

+

+WebIOPi.prototype.ready = function (cb) {

+        w().readyCallback = cb;

+}

+

+WebIOPi.prototype.map = function (pin, type, value) {

+        w().PINS[pin] = Object();

+        w().PINS[pin].type = type

+        w().PINS[pin].value = value;

+        

+        if (type.value == w().TYPE.GPIO.value) {

+                w().GPIO[value].mapped = true;

+        }

+}

+

+WebIOPi.prototype.addALT = function (alt, gpio, name) {

+        var o = Object();

+        o.gpio = gpio;

+        o.name = name;

+        alt.gpios.push(o);

+}

+

+WebIOPi.prototype.updateValue = function (gpio, value) {

+        w().GPIO[gpio].value = value;

+        var style = (value == 1) ? "HIGH" : "LOW";

+        $("#gpio"+gpio).attr("class", style);

+}

+

+WebIOPi.prototype.updateFunction = function (gpio, func) {

+        w().GPIO[gpio].func = func;

+        $("#function"+gpio).val(func);

+        $("#function"+gpio).text(func);

+}

+

+WebIOPi.prototype.updateSlider = function (gpio, slider, value) {

+        $("#"+slider+gpio).val(value);

+}

+

+WebIOPi.prototype.updateALT = function (alt, enable) {

+        for (var p in alt.gpios) {

+                gpio = alt.gpios[p].gpio;

+                $("#description"+gpio).empty();

+                if (enable) {

+                        $("#description"+gpio).append(alt.name + " " + alt.gpios[p].name);

+                        $("#gpio"+gpio).attr("class", alt.name);

+                        $("#function"+gpio).attr("class", "FunctionSpecial");

+                }

+                else {

+                        $("#description"+gpio).append("GPIO " + gpio);

+                        $("#gpio"+gpio).attr("class", "");

+                        $("#function"+gpio).attr("class", "FunctionBasic");

+                }

+        }

+        alt.enabled = enable;

+}

+

+WebIOPi.prototype.refreshGPIO = function (repeat) {

+        $.getJSON(w().context + "*", function(data) {

+                w().updateALT(w().ALT.I2C, data["I2C"]);

+                w().updateALT(w().ALT.SPI, data["SPI"]);

+                w().updateALT(w().ALT.UART, data["UART"]);

+                w().updateALT(w().ALT.ONEWIRE, data["ONEWIRE"]);

+                

+                $.each(data["GPIO"], function(gpio, data) {

+                w().updateFunction(gpio, data["function"]);

+                if ( ((gpio != 4) && ((data["function"] == "IN") || (data["function"] == "OUT"))

+                        || ((gpio == 4) && (w().ALT.ONEWIRE["enabled"] == false)))){

+                        w().updateValue(gpio, data["value"]);

+                }

+                else if (data["function"] == "PWM") {

+                        w().updateSlider(gpio, "ratio", data["ratio"]);

+                        w().updateSlider(gpio, "angle", data["angle"]);

+                }

+                

+                });

+        });

+        if (repeat === true) {

+                setTimeout(function(){w().refreshGPIO(repeat)}, 1000);

+        }

+}

+

+

+WebIOPi.prototype.checkVersion = function () {

+        var version;

+        

+        $.get(w().context + "version", function(data) {

+                _gaq.push(['_trackEvent', 'version', data]);

+//              version = data.split("/")[2];

+//

+//              $.get("http://webiopi.trouch.com/version.php", function(data) {

+//                      var lines = data.split("\n");

+//                      var c = version.split(".");

+//                      var n = lines[0].split(".");

+//                      var updated = false;

+//                      for (i=0; i<Math.min(c.length, n.length); i++) {

+//                              if (n[i]>c[i]) {

+//                                      updated = true;

+//                              }

+//                      }

+//                      if (updated || (n.length > c.length)) {

+//                              var div = $('<div id="update"><a href="' + lines[1] + '">Update available</a></div>');

+//                              $("body").append(div);

+//                      }

+//              });

+        });

+}

+

+WebIOPi.prototype.digitalRead = function (gpio, callback) {

+        if (callback != undefined) {

+                $.get(w().context + 'GPIO/' + gpio + "/value", function(data) {

+                        w().updateValue(gpio, data);

+                        callback(gpio, data);

+                });

+        }

+        return w().GPIO[gpio].value;

+}

+

+WebIOPi.prototype.digitalWrite = function (gpio, value, callback) {

+        if (w().GPIO[gpio].func.toUpperCase()=="OUT") {

+                $.post(w().context + 'GPIO/' + gpio + "/value/" + value, function(data) {

+                        w().updateValue(gpio, data);

+                        if (callback != undefined) {

+                                callback(gpio, data);

+                        }

+                });

+        }

+        else {

+                //console.log(w().GPIO[gpio].func);

+        }

+}

+

+WebIOPi.prototype.getFunction = function (gpio, callback) {

+        if (callback != undefined) {

+                $.get(w().context + 'GPIO/' + gpio + "/function", function(data) {

+                        w().updateFunction(gpio, data);

+                        callback(gpio, data);

+                });

+        }

+        return w().GPIO[gpio].func;

+}

+WebIOPi.prototype.setFunction = function (gpio, func, callback) {

+        $.post(w().context + 'GPIO/' + gpio + "/function/" + func, function(data) {

+                w().updateFunction(gpio, data);

+                if (callback != undefined) {

+                        callback(gpio, data);

+                }

+        });

+}

+

+WebIOPi.prototype.toggleValue = function (gpio) {

+        var value = (w().GPIO[gpio].value == 1) ? 0 : 1;

+        w().digitalWrite(gpio, value);

+}

+

+WebIOPi.prototype.toggleFunction = function (gpio) {

+        var value = (w().GPIO[gpio].func == "IN") ? "OUT" : "IN";

+        w().setFunction(gpio, value)

+}

+

+WebIOPi.prototype.outputSequence = function (gpio, period, sequence, callback) {

+        $.post(w().context + 'GPIO/' + gpio + "/sequence/" + period + "," + sequence, function(data) {

+                w().updateValue(gpio, data);

+                if (callback != undefined) {

+                        callback(gpio, data);

+                }

+        });

+}

+

+WebIOPi.prototype.callMacro = function (macro, args, callback) {

+        if (args == undefined) {

+                args = "";

+        }

+        $.post(w().context + 'macros/' + macro + "/" + args, function(data) {

+                if (callback != undefined) {

+                        callback(macro, args, data);

+                }

+        });

+}

+

+WebIOPi.prototype.enablePWM = function(gpio, callback) {

+        $.post(w().context + 'GPIO/' + gpio + "/pwm/enable", function(data) {

+                if (callback != undefined) {

+                        callback(gpio, data);

+                }

+        });

+}

+

+WebIOPi.prototype.disablePWM = function(gpio, callback) {

+        $.post(w().context + 'GPIO/' + gpio + "/pwm/disable", function(data) {

+                if (callback != undefined) {

+                        callback(gpio, data);

+                }

+        });

+}

+

+WebIOPi.prototype.pulse = function(gpio, callback) {

+        $.post(w().context + 'GPIO/' + gpio + "/pulse/", function(data) {

+                if (callback != undefined) {

+                        callback(gpio, data);

+                }

+        });

+}

+

+WebIOPi.prototype.pulseRatio = function(gpio, ratio, callback) {

+        $.post(w().context + 'GPIO/' + gpio + "/pulseRatio/" + ratio, function(data) {

+                if (callback != undefined) {

+                        callback(gpio, data);

+                }

+        });

+}

+

+WebIOPi.prototype.pulseAngle = function(gpio, angle, callback) {

+        $.post(w().context + 'GPIO/' + gpio + "/pulseAngle/" + angle, function(data) {

+                if (callback != undefined) {

+                        callback(gpio, data);

+                }

+        });

+}

+

+WebIOPi.prototype.setLabel = function (id, label) {

+        $("#" + id).val(label);

+        $("#" + id).text(label);

+}

+

+WebIOPi.prototype.setClass = function (id, cssClass) {

+        $("#" + id).attr("class", cssClass);

+}

+

+WebIOPi.prototype.createButton = function (id, label, callback, callbackUp) {

+        var button = $('<button type="button" class="Default">');

+        button.attr("id", id);

+        button.text(label);

+        if ((callback != undefined) && (callbackUp == undefined)) {

+                button.bind("click", callback);

+        }

+        else if ((callback != undefined) && (callbackUp != undefined)) {

+                if (isMobile()) {

+                        button.bind("vmousedown", callback);

+                        button.bind("vmouseup", callbackUp);

+                }

+                else {

+                        button.bind("mousedown", callback);

+                        button.bind("mouseup", callbackUp);

+                }

+        }

+        return button;

+}

+

+WebIOPi.prototype.createGPIOButton = function (gpio, label) {

+        var button = w().createButton("gpio" + gpio, label);

+        button.bind("click", function(event) {

+                w().toggleValue(gpio);

+        });

+        return button;

+}

+

+WebIOPi.prototype.createFunctionButton = function (gpio) {

+        var button = w().createButton("function" + gpio, " ");

+        button.attr("class", "FunctionBasic");

+        button.bind("click", function(event) {

+                w().toggleFunction(gpio);

+        });

+        return button;

+}

+

+WebIOPi.prototype.createPulseButton = function (id, label, gpio) {

+    var button = webiopi().createButton(id, label);

+    button.bind("click", function(event) {

+        webiopi().pulse(gpio);

+    });

+    return button;

+}

+

+WebIOPi.prototype.createMacroButton = function (id, label, macro, args) {

+    var button = webiopi().createButton(id, label);

+    button.bind("click", function(event) {

+        webiopi().callMacro(macro, args);

+    });

+    return button;

+}

+

+WebIOPi.prototype.createSequenceButton = function (id, label, gpio, period, sequence) {

+    var button = webiopi().createButton(id, label);

+    button.bind("click", function(event) {

+        webiopi().outputSequence(gpio, period, sequence);

+    });

+    return button;

+}

+

+WebIOPi.prototype.createRatioSlider = function(gpio) {

+        var slider = $('<input type="range" min="0.0" max="1.0" step="0.01">');

+        slider.attr("id", "ratio"+gpio);

+        slider.bind("change", function() {

+                w().pulseRatio(gpio, slider.val());

+        });

+        return slider;

+}

+

+WebIOPi.prototype.createAngleSlider = function(gpio) {

+        var slider = $('<input type="range" min="-45" max="45" step="1">');

+        slider.attr("id", "angle"+gpio);

+        slider.bind("change", function() {

+                w().pulseAngle(gpio, slider.val());

+        });

+        return slider;

+}

+

+WebIOPi.prototype.RPiHeader = function () {

+        if (w()._header == undefined) {

+                w()._header = new RPiHeader();

+        }

+        return w()._header;

+}

+

+function RPiHeader() {

+

+}

+

+RPiHeader.prototype.getPinCell = function (pin) {

+        var cell = $('<td align="center">');

+        var button;

+        if (w().PINS[pin].type.value == w().TYPE.GPIO.value) {

+                button = w().createGPIOButton(w().PINS[pin].value, pin);

+        }

+        else {

+                var button = $('<button type="button">');

+                button.val(pin);

+                button.text(pin);

+                button.attr("class", w().PINS[pin].type.style);

+        }

+        cell.append(button);

+        return cell;

+}

+

+RPiHeader.prototype.getDescriptionCell = function (pin, align) {

+        var cell = $('<td>');

+        cell.attr("align", align);

+        

+        var div = $('<div>');

+        div.attr("class", "Description");

+        if (w().PINS[pin].type.value != w().TYPE.GPIO.value) {

+                div.append(w().PINS[pin].value);

+        }

+        else {

+                div.attr("id", "description"+w().PINS[pin].value);

+                div.append("GPIO " + w().PINS[pin].value);

+        }

+        

+        cell.append(div);

+

+        return cell;

+}

+

+RPiHeader.prototype.getFunctionCell = function (pin) {

+        var cell = $('<td align="center">');

+        if (w().PINS[pin].type.value == w().TYPE.GPIO.value) {

+                var button = w().createFunctionButton(w().PINS[pin].value);

+                cell.append(button);

+        }

+        return cell;

+}

+

+RPiHeader.prototype.createTable = function (containerId) {

+        var table = $("<table>");

+        table.attr("id", "RPiHeader")

+        for (var pin=1; pin<=26; pin++) {

+                var line =      $('<tr>');

+                line.append(this.getFunctionCell(pin))

+                line.append(this.getDescriptionCell(pin, "right"))

+                line.append(this.getPinCell(pin));

+

+                pin++;

+                line.append(this.getPinCell(pin));

+                line.append(this.getDescriptionCell(pin, "left"))

+                line.append(this.getFunctionCell(pin))

+

+                table.append(line);

+        }

+        

+        if (containerId != undefined) {

+                $("#"+containerId).append(table);

+        }

+        

+        return table;

+}

+

+WebIOPi.prototype.Expert = function () {

+        if (w()._expert == undefined) {

+                w()._expert = new Expert();

+        }

+        return w()._expert;

+}

+

+function Expert() {

+        

+}

+

+Expert.prototype.createGPIO = function (gpio) {

+        var box = $("<div>");

+        box.append(w().createFunctionButton(gpio));

+        box.append(w().createGPIOButton(gpio, gpio));

+

+        div = $('<div>');

+        div.attr("id", "description"+gpio);

+        div.attr("class", "Description");

+        div.append("GPIO " + gpio);

+        box.append(div);

+

+        return box;

+}

+

+Expert.prototype.createList = function (containerId) {

+        var box = $('<div>');

+        

+        for (i = 0; i<w().GPIO.length; i++) {

+                if (w().GPIO[i].mapped == true) {

+                        var gpio = w().Expert().createGPIO(i);

+                        box.append(gpio);

+                }

+        }

+                

+        if (containerId != undefined) {

+                $("#"+containerId).append(box);

+        }

+        

+        return box;

+} 

+

+WebIOPi.prototype.Serial = function(device) {

+        return new Serial(device);

+}

+

+function Serial(device) {

+        this.device = device;

+        this.url = "/devices/" + device

+}

+

+Serial.prototype.write = function(data) {

+        $.post(this.url, data);

+} 

+

+Serial.prototype.read = function(callback) {

+        $.get(this.url, callback);

+}

+

+WebIOPi.prototype.newDevice = function(type, name) {

+        if (type == "ADC") {

+                return new ADC(name);

+        }

+        

+        if (type == "DAC") {

+                return new DAC(name);

+        }

+

+        if (type == "PWM") {

+                return new PWM(name);

+        }

+

+        if (type == "GPIOPort") {

+                return new GPIOPort(name);

+        }

+

+        if (type == "Temperature") {

+                return new Temperature(name);

+        }

+

+        if (type == "Pressure") {

+                return new Pressure(name);

+        }

+

+        if (type == "Luminosity") {

+                return new Luminosity(name);

+        }

+

+        if (type == "Distance") {

+                return new Distance(name);

+        }

+        

+        if (type == "PiFaceDigital") {

+                return new PiFaceDigital(name);

+        }

+

+        return undefined;

+}

+

+function GPIOPort(name) {

+        this.name = name;

+        this.url = "/devices/" + name;

+        this.onready = null;

+        this.channelCount = 0;

+        this.refreshTime = 1000;

+

+        var port = this;

+        $.get(this.url + "/count", function(data) {

+                port.channelCount = parseInt(data);

+        });

+

+}

+

+GPIOPort.prototype.isReady = function() {

+        return (this.channelCount > 0);

+}

+

+GPIOPort.prototype.toString = function() {

+        if (this.channelCount > 0)

+                return this.name + ": GPIO Port (" + this.channelCount + "-bits)";

+        return this.name + ": GPIO Port";

+}

+

+GPIOPort.prototype.digitalRead = function(channel, callback) {

+        var name = this.name;

+        $.get(this.url + "/" + channel + "/value", function(data) {

+                callback(name, channel, data);

+        });

+}

+

+GPIOPort.prototype.digitalWrite = function(channel, value, callback) {

+        var name = this.name;

+        $.post(this.url + "/" + channel + "/value/" + value, function(data) {

+                callback(name, channel, data);

+        });

+}

+

+GPIOPort.prototype.setFunction = function(channel, func, callback) {

+        var name = this.name;

+        $.post(this.url + "/" + channel + "/function/" + func, function(data) {

+                callback(name, channel, data);

+        });

+}

+

+GPIOPort.prototype.readAll = function(callback) {

+        var name = this.name;

+        $.get(this.url+ "/*", function(data) {

+                callback(name, data);

+        });

+}

+

+GPIOPort.prototype.refreshUI = function() {

+        var port = this;

+        var element = this.element;

+        if ((element != undefined) && (element.header == undefined)) {

+                element.header = $("<h3>" + this + "</h3>");

+                element.append(element.header);

+        }

+        

+        if ((element != undefined) && (element.table == undefined) && this.isReady()) {

+                element.header.text(this)

+                element.table = $("<table>");

+                element.append(element.table);

+

+                var line = $("<tr>");

+                for (var i = this.channelCount-1; i>=0; i--) {

+                        var cell = $("<td>");

+                        cell.text(1<<i);

+                        line.append(cell);

+                }

+                element.table.append(line);

+                

+                line = $("<tr>");

+                for (var i = this.channelCount-1; i>=0; i--) {

+                        var cell = $("<td>");

+                        var button = webiopi().createButton(this.name + "_" + i + "_value", i, function() {

+                                if ($("#" + port.name + "_" + $(this).attr("channel") + "_value").attr("class") == "LOW") {

+                                        value = 1;

+                                }

+                                else {

+                                        value = 0;

+                                }

+                                port.digitalWrite($(this).attr("channel"), value, function(name, channel, data) {

+                                        if (data == "1") {

+                                                $("#" + name + "_" + channel + "_value").attr("class", "HIGH")

+                                        }

+                                        else {

+                                                $("#" + name + "_" + channel + "_value").attr("class", "LOW")

+                                        }

+                                });

+                        });

+                        button.attr("channel", i);

+                        button.attr("class", "LOW");

+                        cell.append(button);

+                        line.append(cell);

+                }

+                element.table.append(line);

+                

+                line = $("<tr>");

+                for (var i = this.channelCount-1; i>=0; i--) {

+                        var cell = $("<td>");

+                        var button = webiopi().createButton(port.name + "_" + i + "_func", "IN", function() {

+                                var func = $(this).text();

+                                console.log(func);

+                                if (func == "IN") {

+                                        func = "OUT";

+                                }

+                                else {

+                                        func = "IN";

+                                }

+                                port.setFunction($(this).attr("channel"), func, function(name, channel, func) {

+                                        $("#" + port.name + "_" + channel + "_func").text(func);

+                                });

+                        });

+                        button.attr("class", "FunctionBasic");

+                        button.attr("channel", i);

+                        cell.append(button);

+                        line.append(cell);

+                }

+                element.table.append(line);

+        }

+        

+        this.readAll(function(name, data) {

+                for (i in data) {

+                        $("#" + name + "_" + i + "_value").attr("class", data[i]["value"] == "1" ? "HIGH" : "LOW");

+                        $("#" + name + "_" + i + "_func").text(data[i]["function"]);

+                }

+                setTimeout(function(){port.refreshUI()}, port.refreshTime);

+        });

+}

+

+function ADC(name) {

+        this.name = name;

+        this.url = "/devices/" + name + "/analog";

+        this.channelCount = 0;

+        this.maxInteger = 0;

+        this.resolution = 0;

+        this.refreshTime = 1000;

+        

+        var adc = this;

+        $.get(this.url + "/count", function(data) {

+                adc.channelCount = parseInt(data);

+        });

+

+        $.get(this.url + "/max", function(data) {

+                adc.maxInteger = parseInt(data);

+        });

+

+        $.get(this.url + "/resolution", function(data) {

+                adc.resolution = parseInt(data);

+        });

+}

+

+ADC.prototype.isReady = function() {

+        return (this.channelCount > 0 && this.maxInteger > 0 && this.resolution > 0 );

+}

+

+ADC.prototype.toString = function() {

+        if (this.channelCount > 0 && this.resolution> 0)

+                return this.name + ": ADC (" + this.resolution + "-bits, " + this.channelCount  + "-channels)";

+        return this.name + ": ADC";

+}

+

+ADC.prototype.readInteger = function(channel, callback) {

+        var name = this.name;

+        $.get(this.url + "/" + channel + "/integer", function(data) {

+                callback(name, channel, data);

+        });

+}

+

+ADC.prototype.readFloat = function(channel, callback) {

+        var name = this.name;

+        $.get(this.url + "/" + channel + "/float", function(data) {

+                callback(name, channel, data);

+        });

+}

+

+ADC.prototype.readVolt = function(channel, callback) {

+        var name = this.name;

+        $.get(this.url + "/" + channel + "/volt", function(data) {

+                callback(name, channel, data);

+        });

+}

+

+ADC.prototype.readAllInteger = function(callback) {

+        var name = this.name;

+        $.get(this.url + "/*/integer", function(data) {

+                callback(name, data);

+        });

+}

+

+ADC.prototype.readAllFloat = function(callback) {

+        var name = this.name;

+        $.get(this.url + "/*/float", function(data) {

+                callback(name, data);

+        });

+}

+

+ADC.prototype.readAllVolt = function(callback) {

+        var name = this.name;

+        $.get(this.url + "/*/volt", function(data) {

+                callback(name, data);

+        });

+}

+

+ADC.prototype.refreshUI = function () {

+        var adc = this;

+        var element = this.element;

+        

+        if ((element != undefined) && (element.header == undefined)) {

+                element.header = $("<h3>" + this + "</h3>");

+                element.append(element.header);

+        }

+        

+        if ((element != undefined) && (element.channels == undefined) && this.isReady()) {

+                element.header.text(this);

+                element.channels = Array();

+                for (i = 0; i<this.channelCount; i++) {

+                        var div = $("<div>");

+                        div.text("Channel-" + i);

+                        element.append(div);

+                        element.channels[i] = div;

+                        

+                }

+        }

+        this.readAllVolt(function(name, data) {

+                for (i in data) {

+                        if ((element != undefined) && (element.channels != undefined)) {

+                                var div = element.channels[i];

+                                div.text("Channel-" + i + ": " + parseFloat(data[i]).toFixed(2) + "V")

+                        }

+                }

+                setTimeout(function(){adc.refreshUI()}, adc.refreshTime);

+        });

+}

+

+

+function DAC(name) {

+        this.name = name;

+        this.url = "/devices/" + name + "/analog";

+        this.channelCount = 0;

+        this.maxInteger = 0;

+        this.resolution = 0;

+        

+        var dac = this;

+        $.get(this.url + "/count", function(data) {

+                dac.channelCount = parseInt(data);

+        });

+

+        $.get(this.url + "/max", function(data) {

+                dac.maxInteger = parseInt(data);

+        });

+

+        $.get(this.url + "/resolution", function(data) {

+                dac.resolution = parseInt(data);

+        });

+}

+

+DAC.prototype.isReady = function() {

+        return (this.channelCount > 0 && this.maxInteger > 0 && this.resolution > 0 );

+}

+

+DAC.prototype.toString = function() {

+        if (this.channelCount > 0 && this.resolution> 0)

+                return this.name + ": DAC (" + this.resolution + "-bits, " + this.channelCount  + "-channels)";

+        return this.name + ": DAC";

+}

+

+DAC.prototype.writeInteger = function(channel, value, callback) {

+        var name = this.name;

+        $.post(this.url + "/" + channel + "/integer/" + value, function(data) {

+                callback(name, channel, data);

+        });

+}

+

+DAC.prototype.writeFloat = function(channel, value, callback) {

+        var name = this.name;

+        $.post(this.url + "/" + channel + "/float/" + value, function(data) {

+                callback(name, channel, data);

+        });

+}

+

+DAC.prototype.readAllInteger = function(callback) {

+        var name = this.name;

+        $.get(this.url + "/*/integer", function(data) {

+                callback(name, data);

+        });

+}

+

+DAC.prototype.readAllFloat = function(callback) {

+        var name = this.name;

+        $.get(this.url + "/*/float", function(data) {

+                callback(name, data);

+        });

+}

+

+DAC.prototype.refreshUI = function() {

+        var dac = this;

+        var element = this.element;

+

+        if ((element != undefined) && (element.header == undefined)) {

+                element.header = $("<h3>" + this + "</h3>");

+                element.append(element.header);

+        }

+        

+        if ((element != undefined) && (element.table == undefined) && this.isReady()) {

+                element.header.text(this);

+                element.table = $("<table>");

+                element.append(element.table);

+                for (var i = 0; i<this.channelCount; i++) {

+                        var line = $("<tr>");

+                        var cell

+                        cell = $("<td>");

+                        cell.text("Channel-" + i);

+                        line.append(cell);

+                        

+                        cell = $("<td>");

+                        var slider = $('<input type="range" min="0" max="100" step="1" value="0">')

+                        slider.attr("channel", i);

+                        slider.attr("id", "slider_" + this.name + "_" + i);

+                        cell.append(slider);

+                        line.append(cell);

+

+                        cell = $("<td>");

+                        var span = $('<span>');

+                        span.attr("id", "span_" + this.name + "_" + i);

+                        cell.append(span);

+                        line.append(cell);

+

+                        slider.bind("change", function() {

+                                dac.writeFloat($(this).attr("channel"), $(this).val()/100, function(name, channel, data) {

+                                        var val = (data*100).toFixed(0);

+                                        var volts = (data*3.3).toFixed(2);

+                                        $("#span_" + name + "_" + channel).text(volts + "V - " + val + "%");

+                                        $("#slider_" + name + "_" + channel).val(val);

+                                });

+                        });

+

+                        element.table.append(line);

+                }

+                this.readAllFloat(function(name, data) {

+                        for (i in data) {

+                                var val = (data[i]*100).toFixed(0);

+                                var volts = (data[i]*3.3).toFixed(2);

+                                $("#span_" + name + "_" + i).text(volts + "V - " + val + "%");

+                                $("#slider_" + name + "_" + i).val(val);

+                        }

+                });

+        }

+        else {

+                setTimeout(function(){dac.refreshUI()}, 1000);

+        }

+

+}

+

+function PWM(name) {

+        this.name = name;

+        this.url = "/devices/" + name + "/pwm";

+        this.channelCount = 0;

+        this.maxInteger = 0;

+        this.resolution = 0;

+        this.refreshTime = 1000;

+        

+        var pwm = this;

+        $.get(this.url + "/count", function(data) {

+                pwm.channelCount = parseInt(data);

+        });

+

+        $.get(this.url + "/max", function(data) {

+                pwm.maxInteger = parseInt(data);

+        });

+

+        $.get(this.url + "/resolution", function(data) {

+                pwm.resolution = parseInt(data);

+        });

+}

+

+PWM.prototype.isReady = function() {

+        return (this.channelCount > 0 && this.maxInteger > 0 && this.resolution > 0 );

+}

+

+PWM.prototype.toString = function() {

+        if (this.channelCount > 0 && this.resolution> 0)

+                return this.name + ": PWM (" + this.resolution + "-bits, " + this.channelCount  + "-channels)";

+        return this.name + ": PWM";

+}

+

+PWM.prototype.writeInteger = function(channel, value, callback) {

+        var name = this.name;

+        $.post(this.url + "/" + channel + "/integer/" + value, function(data) {

+                callback(name, channel, data);

+        });

+}

+

+PWM.prototype.writeFloat = function(channel, value, callback) {

+        var name = this.name;

+        $.post(this.url + "/" + channel + "/float/" + value, function(data) {

+                callback(name, channel, data);

+        });

+}

+

+PWM.prototype.writeAngle = function(channel, value, callback) {

+        var name = this.name;

+        $.post(this.url + "/" + channel + "/angle/" + value, function(data) {

+                callback(name, channel, data);

+        });

+}

+

+PWM.prototype.readAllInteger = function(callback) {

+        var name = this.name;

+        $.get(this.url + "/*/integer", function(data) {

+                callback(name, data);

+        });

+}

+

+PWM.prototype.readAllFloat = function(callback) {

+        var name = this.name;

+        $.get(this.url + "/*/float", function(data) {

+                callback(name, data);

+        });

+}

+

+PWM.prototype.readAll = function(callback) {

+        var name = this.name;

+        $.get(this.url + "/*", function(data) {

+                callback(name, data);

+        });

+}

+

+PWM.prototype.refreshUI = function() {

+        var pwm = this;

+        var element = this.element;

+        if ((element != undefined) && (element.header == undefined)) {

+                element.header = $("<h3>" + this + "</h3>");

+                element.append(element.header);

+        }

+        

+        if ((element != undefined) && (element.table == undefined) && this.isReady()) {

+                element.header.text(this);

+                element.table = $("<table>");

+                element.append(element.table);

+

+                for (var i = 0; i<this.channelCount; i++) {

+                        var line = $("<tr>");

+                        var cell

+                        cell = $("<td>");

+                        cell.text("Channel-" + i);

+                        line.append(cell);

+                        

+                        cell = $("<td>");

+                        var checkbox = $('<input type="checkbox">');

+                        checkbox.attr("id", "checkbox_" + this.name + "_" + i);

+                        checkbox.attr("channel", i);

+                        

+                        var cblabel = $('<label>');

+                        cblabel.append(checkbox);

+                        cblabel.append("Servo");

+                        cell.append(cblabel);

+                        line.append(cell);

+                        

+                        cell = $("<td>");

+                        var slider = $('<input type="range" min="0" max="100" step="1" value="0">')

+                        slider.attr("channel", i);

+                        slider.attr("id", "slider_" + this.name + "_" + i);

+                        cell.append(slider);

+                        line.append(cell);

+

+                        cell = $("<td>");

+                        var span = $('<span>');

+                        span.attr("id", "span_" + this.name + "_" + i);

+                        cell.append(span);

+                        line.append(cell);

+

+                        checkbox.bind("change", function() {

+                                var slider = $("#slider_" + pwm.name + "_" + $(this).attr("channel"))

+                                slider.attr("servo", $(this).is(":checked"));

+                        });

+

+                        slider.bind("change", function() {

+                                if ($(this).attr("servo") == "true") {

+                                        pwm.writeAngle($(this).attr("channel"), $(this).val(), function(name, channel, data) {

+                                                var val = data;

+                                                $("#span_" + name + "_" + channel).text(val + "°");

+                                                $("#slider_" + name + "_" + channel).val(val);

+                                        });

+                                }

+                                else {

+                                        pwm.writeFloat($(this).attr("channel"), $(this).val()/100, function(name, channel, data) {

+                                                var val = (data*100).toFixed(0);

+                                                $("#span_" + name + "_" + channel).text(val + "%");

+                                                $("#slider_" + name + "_" + channel).val(val);

+                                        });

+                                }

+                        });

+

+                        element.table.append(line);

+                }

+        }

+

+        this.readAll(function(name, data) {

+                for (i in data) {

+                        var slider = $("#slider_" + name + "_" + i);

+                        var span = $("#span_" + name + "_" + i);

+                        var val = 0;

+

+                        if (slider.attr("servo") == "true") {

+                                slider.attr("min", -45);

+                                slider.attr("max", 45);

+                                val = data[i]["angle"];

+                                span.text(val + "°");

+                        }

+                        else {

+                                slider.attr("min", 0);

+                                slider.attr("max", 100);

+                                val = (data[i]["float"]*100).toFixed(0);

+                                span.text(val + "%");

+                        }

+                        slider.val(val);

+                        

+                }

+                setTimeout(function(){pwm.refreshUI()}, pwm.refreshTime);

+        });

+}

+

+function Temperature(name) {

+        this.name = name;

+        this.url = "/devices/" + name + "/sensor";

+        this.refreshTime = 5000;

+}

+

+Temperature.prototype.toString = function() {

+        return this.name + ": Temperature";

+}

+

+Temperature.prototype.getKelvin = function(callback) {

+        $.get(this.url + "/temperature/k", function(data) {

+                callback(this.name, data);

+        });

+}

+

+Temperature.prototype.getCelsius = function(callback) {

+        $.get(this.url + "/temperature/c", function(data) {

+                callback(this.name, data);

+        });

+}

+

+Temperature.prototype.getFahrenheit = function(callback) {

+        $.get(this.url + "/temperature/f", function(data) {

+                callback(this.name, data);

+        });

+}

+

+Temperature.prototype.refreshUI = function() {

+        var temp = this;

+        var element = this.element;

+        if ((element != undefined) && (element.header == undefined)) {

+                element.header = $("<h3>" + this + "</h3>");

+                element.append(element.header);

+        }

+        

+        this.getCelsius(function(name, data){

+                if (element != undefined) {

+                        element.header.text(temp + ": " + data + "°C");

+                }

+                setTimeout(function(){temp.refreshUI()}, temp.refreshTime);

+        });

+}

+

+function Pressure(name) {

+        this.name = name;

+        this.url = "/devices/" + name + "/sensor";

+        this.refreshTime = 5000;

+}

+

+Pressure.prototype.toString = function() {

+        return this.name + ": Pressure";

+}

+

+Pressure.prototype.getPascal = function(callback) {

+        $.get(this.url + "/pressure/pa", function(data) {

+                callback(this.name, data);

+        });

+}

+

+Pressure.prototype.getHectoPascal = function(callback) {

+        $.get(this.url + "/pressure/hpa", function(data) {

+                callback(this.name, data);

+        });

+}

+

+Pressure.prototype.refreshUI = function() {

+        var pressure = this;

+        var element = this.element;

+        if ((element != undefined) && (element.header == undefined)) {

+                element.header = $("<h3>" + this + "</h3>");

+                element.append(element.header);

+        }

+        

+        pressure.getHectoPascal(function(name, data){

+                if (element != undefined) {

+                        element.header.text(pressure + ": " + data + "hPa");

+                }

+                setTimeout(function(){pressure.refreshUI()}, pressure.refreshTime);

+        });

+}

+        

+

+function Luminosity(name) {

+        this.name = name;

+        this.url = "/devices/" + name + "/sensor";

+        this.refreshTime = 1000;

+}

+

+Luminosity.prototype.toString = function() {

+        return this.name + ": Luminosity";

+}

+

+Luminosity.prototype.getLux = function(callback) {

+        $.get(this.url + "/luminosity/lx", function(data) {

+                callback(this.name, data);

+        });

+}

+

+Luminosity.prototype.refreshUI = function() {

+        var lum = this;

+        var element = this.element;

+        

+        if ((element != undefined) && (element.header == undefined)) {

+                element.header = $("<h3>" + this + "</h3>");

+                element.append(element.header);

+        }

+        

+        this.getLux(function(name, data){

+                if (element != undefined) {

+                        element.header.text(lum + ": " + data + "lx");

+                }

+                setTimeout(function(){lum.refreshUI()}, lum.refreshTime);

+        });

+}

+

+function Distance(name) {

+        this.name = name;

+        this.url = "/devices/" + name + "/sensor";

+        this.refreshTime = 1000;

+}

+

+Distance.prototype.toString = function() {

+        return this.name + ": Distance";

+}

+

+Distance.prototype.getMillimeter = function(callback) {

+        $.get(this.url + "/distance/mm", function(data) {

+                callback(this.name, data);

+        });

+}

+

+Distance.prototype.refreshUI = function() {

+        var dist = this;

+        var element = this.element;

+        

+        if ((element != undefined) && (element.header == undefined)) {

+                element.header = $("<h3>" + this + "</h3>");

+                element.append(element.header);

+        }

+        

+        this.getMillimeter(function(name, data){

+                if (element != undefined) {

+                        element.header.text(dist + ": " + data + "mm");

+                }

+                setTimeout(function(){dist.refreshUI()}, dist.refreshTime);

+        });

+}

+

+function PiFaceDigital(name) {

+        this.name = name;

+        this.url = "/devices/" + name + "/digital";

+        this.onready = null;

+        this.refreshTime = 1000;

+}

+

+PiFaceDigital.prototype.toString = function() {

+        return "PiFaceDigital";

+}

+

+PiFaceDigital.prototype.input = function(channel, callback) {

+        var name = this.name;

+        $.get(this.url + "/input/" + channel, function(data) {

+                callback(name, channel, data);

+        });

+}

+

+PiFaceDigital.prototype.output = function(channel, value, callback) {

+        var name = this.name;

+        $.post(this.url + "/output/" + channel + "/" + value, function(data) {

+                callback(name, channel, data);

+        });

+}

+

+PiFaceDigital.prototype.readAll = function(callback) {

+        var name = this.name;

+        $.get(this.url+ "/*", function(data) {

+                callback(name, data);

+        });

+}

+

+PiFaceDigital.prototype.refreshUI = function() {

+        var port = this;

+        var element = this.element;

+        if ((element != undefined) && (element.header == undefined)) {

+                element.header = $("<h3>" + this + "</h3>");

+                element.append(element.header);

+        }

+        

+        if ((element != undefined) && (element.table == undefined)) {

+                element.header.text(this)

+                element.table = $("<table>");

+                element.append(element.table);

+

+                var line = $("<tr>");

+                line.append($("<td><b>Outputs</b></td>"))

+                for (var i = 7; i>=0; i--) {

+                        var cell = $("<td>");

+                        var button = webiopi().createButton(this.name + "_output_" + i, i, function() {

+                                if ($("#" + port.name + "_output_" + $(this).attr("channel")).attr("class") == "LOW") {

+                                        value = 1;

+                                }

+                                else {

+                                        value = 0;

+                                }

+                                port.output($(this).attr("channel"), value, function(name, channel, data) {

+                                        var button = $("#" + name + "_output_" + channel);

+                                        if (data == "1") {

+                                                button.attr("class", "HIGH")

+                                        }

+                                        else {

+                                                button.attr("class", "LOW")

+                                        }

+                                });

+                        });

+                        button.attr("channel", i);

+                        button.attr("class", "LOW");

+                        cell.append(button);

+                        line.append(cell);

+                }

+                element.table.append(line);

+

+                line = $("<tr>");

+                line.append($("<td><b>Inputs</b></td>"))

+                for (var i = 7; i>=0; i--) {

+                        var cell = $("<td>");

+                        var button = webiopi().createButton(this.name + "_input_" + i, i, function() {

+                        });

+                        button.attr("channel", i);

+                        button.attr("class", "LOW");

+                        cell.append(button);

+                        line.append(cell);

+                }

+                element.table.append(line);

+

+        }

+        

+        this.readAll(function(name, data) {

+                for (i in data["input"]) {

+                        $("#" + name + "_input_" + i).attr("class", data["input"][i] == "1" ? "HIGH" : "LOW");

+                }

+                for (i in data["output"]) {

+                        $("#" + name + "_output_" + i).attr("class", data["output"][i] == "1" ? "HIGH" : "LOW");

+                }

+                setTimeout(function(){port.refreshUI()}, port.refreshTime);

+        });

+}

+

diff --git a/java/client/src/Test.java b/java/client/src/Test.java
new file mode 100644
index 0000000..7165b17
--- /dev/null
+++ b/java/client/src/Test.java
@@ -0,0 +1,52 @@
+import com.trouch.webiopi.client.PiClient;
+import com.trouch.webiopi.client.PiCoapClient;
+import com.trouch.webiopi.client.PiHttpClient;
+import com.trouch.webiopi.client.PiMixedClient;
+import com.trouch.webiopi.client.PiMulticastClient;
+import com.trouch.webiopi.client.devices.analog.ADC;
+import com.trouch.webiopi.client.devices.analog.DAC;
+import com.trouch.webiopi.client.devices.analog.PWM;
+import com.trouch.webiopi.client.devices.digital.GPIO;
+import com.trouch.webiopi.client.devices.digital.NativeGPIO;
+import com.trouch.webiopi.client.devices.sensor.Temperature;
+
+public class Test {
+
+        public static void main(String[] args) {
+                String host = "192.168.1.234";
+                PiClient client = new PiHttpClient(host, PiHttpClient.DEFAULT_PORT);
+//              PiClient client = new PiCoapClient(host, PiCoapClient.DEFAULT_PORT);
+//              PiClient client = new PiMixedClient(host, PiHttpClient.DEFAULT_PORT, PiCoapClient.DEFAULT_PORT);
+//              PiClient client = new PiMulticastClient(PiMulticastClient.DEFAULT_PORT);
+
+                client.setCredentials("webiopi", "raspberry");
+                
+                Temperature temp0 = new Temperature(client, "temp0");
+                System.out.println(temp0.getCelsius() + "°C");
+
+                NativeGPIO gpio = new NativeGPIO(client);
+                GPIO gpio0 = new GPIO(client, "gpio0");
+                GPIO gpio2 = new GPIO(client, "gpio2");
+
+                gpio.setFunction(25, GPIO.OUT);
+                gpio0.setFunction(0, GPIO.OUT);
+                gpio2.setFunction(12, GPIO.OUT);
+
+                DAC dac = new DAC(client, "dac1");
+                ADC adc = new ADC(client, "adc0");
+                PWM pwm = new PWM(client, "pwm0");
+
+                boolean value = true;
+                for (int i = 0; i <= 100; i++) {
+                        gpio.digitalWrite(25, value);
+                        gpio0.digitalWrite(0, value);
+                        gpio2.digitalWrite(12, value);
+
+                        dac.writeFloat(0, (float) (i / 100.0));
+                        System.out.println("" + (adc.readFloat(1) * 3.3) + "V");
+                        pwm.writeAngle(7, i - 50);
+                        value = !value;
+                }
+        }
+
+}
diff --git a/java/client/src/com/trouch/webiopi/client/PiClient.java b/java/client/src/com/trouch/webiopi/client/PiClient.java
new file mode 100644
index 0000000..96a4f63
--- /dev/null
+++ b/java/client/src/com/trouch/webiopi/client/PiClient.java
@@ -0,0 +1,38 @@
+/* Copyright 2013 Eric Ptak - trouch.com
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+*/
+
+package com.trouch.webiopi.client;
+
+import org.apache.commons.codec.binary.Base64;
+
+public abstract class PiClient {
+        
+        protected String urlBase;
+        protected String auth;
+
+        public static String encodeCredentials(String login, String password) {
+                return Base64.encodeBase64String((login + ":" + password).getBytes());
+        }
+
+        public PiClient(String protocol, String host, int port) {
+                this.urlBase = protocol + "://" + host + ":" + port; 
+        }
+        
+        public void setCredentials(String login, String password) {
+                this.auth = "Basic " + encodeCredentials(login, password);
+        }
+        
+        public abstract String sendRequest(String method, String path) throws Exception;
+
+}
diff --git a/java/client/src/com/trouch/webiopi/client/PiCoapClient.java b/java/client/src/com/trouch/webiopi/client/PiCoapClient.java
new file mode 100644
index 0000000..4a4f2d3
--- /dev/null
+++ b/java/client/src/com/trouch/webiopi/client/PiCoapClient.java
@@ -0,0 +1,57 @@
+/* Copyright 2013 Eric Ptak - trouch.com
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+*/
+
+package com.trouch.webiopi.client;
+
+import com.trouch.coap.client.CoapClient;
+import com.trouch.coap.messages.CoapRequest;
+import com.trouch.coap.messages.CoapResponse;
+import com.trouch.coap.methods.CoapGet;
+import com.trouch.coap.methods.CoapPost;
+
+
+public class PiCoapClient extends PiClient {
+        public final static int DEFAULT_PORT = 5683;
+        private CoapClient client;
+
+        public PiCoapClient(String host) {
+                super("coap", host, DEFAULT_PORT);
+                client = new CoapClient();
+        }
+
+        public PiCoapClient(String host, int port) {
+                super("coap", host, port);
+                client = new CoapClient();
+        }
+
+        @Override
+        public String sendRequest(String method, String path) throws Exception {
+                CoapRequest request;
+                if (method == "GET") {
+                        request = new CoapGet(this.urlBase + path);
+                }
+                else if (method == "POST") {
+                        request = new CoapPost(this.urlBase + path);
+                }
+                else throw new Exception("Method not supported: " + method);
+                
+                CoapResponse response = client.sendRequest(request);
+                if (response != null) {
+                        return response.getPayload();
+                }
+                
+                return null;
+        }
+
+}
diff --git a/java/client/src/com/trouch/webiopi/client/PiHttpClient.java b/java/client/src/com/trouch/webiopi/client/PiHttpClient.java
new file mode 100644
index 0000000..6562bc7
--- /dev/null
+++ b/java/client/src/com/trouch/webiopi/client/PiHttpClient.java
@@ -0,0 +1,68 @@
+/* Copyright 2013 Eric Ptak - trouch.com
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+*/
+
+package com.trouch.webiopi.client;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+public class PiHttpClient extends PiClient {
+        public final static int DEFAULT_PORT = 8000;
+
+        public PiHttpClient(String host) {
+                super("http", host, DEFAULT_PORT);
+        }
+
+        public PiHttpClient(String host, int port) {
+                super("http", host, port);
+        }
+
+        @Override
+        public String sendRequest(String method, String path) throws Exception {
+                BufferedReader reader = null;
+                try {
+                        URL url = new URL(this.urlBase + path);
+                        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+                        connection.setRequestMethod(method);
+                        if (this.auth != null) {
+                                connection.setRequestProperty("Authorization", this.auth);
+                        }
+
+                        // read the output from the server
+                        reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+                        StringBuilder stringBuilder = new StringBuilder();
+
+                        String line = null;
+                        while ((line = reader.readLine()) != null) {
+                                stringBuilder.append(line).append('\n');
+                        }
+                        return stringBuilder.toString();
+                } catch (Exception e) {
+                        e.printStackTrace();
+                        throw e;
+                } finally {
+                        if (reader != null) {
+                                try {
+                                        reader.close();
+                                } catch (IOException ioe) {
+                                        ioe.printStackTrace();
+                                }
+                        }
+                }
+        }
+
+}
diff --git a/java/client/src/com/trouch/webiopi/client/PiMixedClient.java b/java/client/src/com/trouch/webiopi/client/PiMixedClient.java
new file mode 100644
index 0000000..8922f6f
--- /dev/null
+++ b/java/client/src/com/trouch/webiopi/client/PiMixedClient.java
@@ -0,0 +1,56 @@
+/* Copyright 2013 Eric Ptak - trouch.com
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+*/
+
+package com.trouch.webiopi.client;
+
+public class PiMixedClient extends PiClient {
+        private PiHttpClient http;
+        private PiCoapClient coap;
+        
+        private int tries        = 0;
+        private int maxTries = 3;
+        
+        public PiMixedClient(String host) {
+                super("", "", 0);
+                http = new PiHttpClient(host);
+                coap = new PiCoapClient(host);
+        }
+        
+        public PiMixedClient(String host, int httpPort, int coapPort) {
+                super("", "", 0);
+                http = new PiHttpClient(host, httpPort);
+                coap = new PiCoapClient(host, coapPort);
+        }
+        
+        @Override
+        public void setCredentials(String login, String password) {
+                http.setCredentials(login, password);
+                coap.setCredentials(login, password);
+        }
+
+        @Override
+        public String sendRequest(String method, String path) throws Exception {
+                if (tries < maxTries) {
+                        String response = coap.sendRequest(method, path);
+                        if (response != null) {
+                                tries = 0;
+                                return response;
+                        }
+                        tries++;
+                }
+                
+                return http.sendRequest(method, path);
+        }
+        
+}
diff --git a/java/client/src/com/trouch/webiopi/client/PiMulticastClient.java b/java/client/src/com/trouch/webiopi/client/PiMulticastClient.java
new file mode 100644
index 0000000..22b1d9e
--- /dev/null
+++ b/java/client/src/com/trouch/webiopi/client/PiMulticastClient.java
@@ -0,0 +1,27 @@
+/* Copyright 2013 Eric Ptak - trouch.com
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+*/
+
+package com.trouch.webiopi.client;
+
+public class PiMulticastClient extends PiCoapClient {
+
+        public PiMulticastClient() {
+                super("224.0.1.123", PiMulticastClient.DEFAULT_PORT);
+        }
+
+        public PiMulticastClient(int port) {
+                super("224.0.1.123", port);
+        }
+
+}
diff --git a/java/client/src/com/trouch/webiopi/client/devices/Device.java b/java/client/src/com/trouch/webiopi/client/devices/Device.java
new file mode 100644
index 0000000..b12139d
--- /dev/null
+++ b/java/client/src/com/trouch/webiopi/client/devices/Device.java
@@ -0,0 +1,44 @@
+/* Copyright 2013 Eric Ptak - trouch.com
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+*/
+
+package com.trouch.webiopi.client.devices;
+
+import com.trouch.webiopi.client.PiClient;
+
+public class Device {
+        
+        private PiClient client;
+        protected String path;
+
+        public Device(PiClient client, String deviceName, String type) {
+                this.client = client;
+                if (type != null) {
+                        this.path = "/devices/" + deviceName + "/" + type;
+                }
+                else {
+                        this.path = "/devices/" + deviceName;
+                }
+        }
+        
+        public String sendRequest(String method, String subPath) {
+                try {
+                        return this.client.sendRequest(method, this.path + subPath);
+                } catch (Exception e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                        return null;
+                }
+        }
+
+}
diff --git a/java/client/src/com/trouch/webiopi/client/devices/analog/ADC.java b/java/client/src/com/trouch/webiopi/client/devices/analog/ADC.java
new file mode 100644
index 0000000..f8c349e
--- /dev/null
+++ b/java/client/src/com/trouch/webiopi/client/devices/analog/ADC.java
@@ -0,0 +1,34 @@
+/* Copyright 2013 Eric Ptak - trouch.com
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+*/
+
+package com.trouch.webiopi.client.devices.analog;
+
+import com.trouch.webiopi.client.PiClient;
+import com.trouch.webiopi.client.devices.Device;
+
+public class ADC extends Device {
+
+        public ADC(PiClient client, String deviceName) {
+                super(client, deviceName, "analog");
+        }
+        
+        public ADC(PiClient client, String deviceName, String type) {
+                super(client, deviceName, type);
+        }
+
+        public float readFloat(int channel) {
+                return Float.parseFloat(this.sendRequest("GET", "/" + channel + "/float"));
+        }
+
+}
diff --git a/java/client/src/com/trouch/webiopi/client/devices/analog/DAC.java b/java/client/src/com/trouch/webiopi/client/devices/analog/DAC.java
new file mode 100644
index 0000000..901d9c4
--- /dev/null
+++ b/java/client/src/com/trouch/webiopi/client/devices/analog/DAC.java
@@ -0,0 +1,37 @@
+/* Copyright 2013 Eric Ptak - trouch.com
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+*/
+
+package com.trouch.webiopi.client.devices.analog;
+
+import com.trouch.webiopi.client.PiClient;
+
+public class DAC extends ADC {
+
+        public DAC(PiClient client, String deviceName) {
+                super(client, deviceName);
+        }
+
+        public DAC(PiClient client, String deviceName, String type) {
+                super(client, deviceName, type);
+        }
+
+        public float writeFloat(int channel, float value) {
+                return Float.parseFloat(this.sendRequest("POST", "/" + channel + "/float/" + value));
+        }
+
+        public float writeVolt(int channel, float value) {
+                return Float.parseFloat(this.sendRequest("POST", "/" + channel + "/volt/" + value));
+        }
+
+}
diff --git a/java/client/src/com/trouch/webiopi/client/devices/analog/PWM.java b/java/client/src/com/trouch/webiopi/client/devices/analog/PWM.java
new file mode 100644
index 0000000..fdc4674
--- /dev/null
+++ b/java/client/src/com/trouch/webiopi/client/devices/analog/PWM.java
@@ -0,0 +1,33 @@
+/* Copyright 2013 Eric Ptak - trouch.com
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+*/
+
+package com.trouch.webiopi.client.devices.analog;
+
+import com.trouch.webiopi.client.PiClient;
+
+public class PWM extends DAC {
+
+        public PWM(PiClient client, String deviceName) {
+                super(client, deviceName, "pwm");
+        }
+
+        public float readAngle(int channel) {
+                return Float.parseFloat(this.sendRequest("GET", "/" + channel + "/angle"));
+        }
+
+        public float writeAngle(int channel, float angle) {
+                return Float.parseFloat(this.sendRequest("POST", "/" + channel + "/angle/" + angle));
+        }
+
+}
diff --git a/java/client/src/com/trouch/webiopi/client/devices/digital/GPIO.java b/java/client/src/com/trouch/webiopi/client/devices/digital/GPIO.java
new file mode 100644
index 0000000..c08dff5
--- /dev/null
+++ b/java/client/src/com/trouch/webiopi/client/devices/digital/GPIO.java
@@ -0,0 +1,53 @@
+/* Copyright 2013 Eric Ptak - trouch.com
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+*/
+
+package com.trouch.webiopi.client.devices.digital;
+
+import com.trouch.webiopi.client.PiClient;
+import com.trouch.webiopi.client.devices.Device;
+
+public class GPIO extends Device {
+        
+        public final static String OUT = "OUT";
+        public final static String IN = "IN";
+
+        public GPIO(PiClient client, String deviceName) {
+                super(client, deviceName, null);
+        }
+        
+        public String getFunction(int channel) {
+                return this.sendRequest("GET", "/" + channel + "/function");
+        }
+
+        public String setFunction(int channel, String function) {
+                return this.sendRequest("POST", "/" + channel + "/function/" + function);
+        }
+        
+        public boolean digitalRead(int channel) {
+                String res = this.sendRequest("GET", "/" + channel + "/value");
+                if (res.equals("1")) {
+                        return true;
+                }
+                return false;
+        }
+
+        public boolean digitalWrite(int channel, boolean value) {
+                String res = this.sendRequest("POST", "/" + channel + "/value/" + (value ? "1" : "0"));
+                if (res.equals("1")) {
+                        return true;
+                }
+                return false;
+        }
+
+}
diff --git a/java/client/src/com/trouch/webiopi/client/devices/digital/NativeGPIO.java b/java/client/src/com/trouch/webiopi/client/devices/digital/NativeGPIO.java
new file mode 100644
index 0000000..a5bc05b
--- /dev/null
+++ b/java/client/src/com/trouch/webiopi/client/devices/digital/NativeGPIO.java
@@ -0,0 +1,26 @@
+/* Copyright 2013 Eric Ptak - trouch.com
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+*/
+
+package com.trouch.webiopi.client.devices.digital;
+
+import com.trouch.webiopi.client.PiClient;
+
+public class NativeGPIO extends GPIO {
+
+        public NativeGPIO(PiClient client) {
+                super(client, "");
+                this.path = "/GPIO";
+        }
+
+}
diff --git a/java/client/src/com/trouch/webiopi/client/devices/sensor/Distance.java b/java/client/src/com/trouch/webiopi/client/devices/sensor/Distance.java
new file mode 100644
index 0000000..63ac485
--- /dev/null
+++ b/java/client/src/com/trouch/webiopi/client/devices/sensor/Distance.java
@@ -0,0 +1,30 @@
+/* Copyright 2013 Eric Ptak - trouch.com
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+*/
+
+package com.trouch.webiopi.client.devices.sensor;
+
+import com.trouch.webiopi.client.PiClient;
+import com.trouch.webiopi.client.devices.Device;
+
+public class Distance extends Device {
+
+        public Distance(PiClient client, String deviceName) {
+                super(client, deviceName, "sensor");
+        }
+
+        public float getMillimeter() {
+                return Float.parseFloat(this.sendRequest("GET", "/distance/mm"));
+        }
+
+}
diff --git a/java/client/src/com/trouch/webiopi/client/devices/sensor/Luminosity.java b/java/client/src/com/trouch/webiopi/client/devices/sensor/Luminosity.java
new file mode 100644
index 0000000..29eda32
--- /dev/null
+++ b/java/client/src/com/trouch/webiopi/client/devices/sensor/Luminosity.java
@@ -0,0 +1,30 @@
+/* Copyright 2013 Eric Ptak - trouch.com
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+*/
+
+package com.trouch.webiopi.client.devices.sensor;
+
+import com.trouch.webiopi.client.PiClient;
+import com.trouch.webiopi.client.devices.Device;
+
+public class Luminosity extends Device {
+
+        public Luminosity(PiClient client, String deviceName) {
+                super(client, deviceName, "sensor");
+        }
+
+        public float getLux() {
+                return Float.parseFloat(this.sendRequest("GET", "/luminosity/lx"));
+        }
+
+}
diff --git a/java/client/src/com/trouch/webiopi/client/devices/sensor/Pressure.java b/java/client/src/com/trouch/webiopi/client/devices/sensor/Pressure.java
new file mode 100644
index 0000000..1f766a9
--- /dev/null
+++ b/java/client/src/com/trouch/webiopi/client/devices/sensor/Pressure.java
@@ -0,0 +1,34 @@
+/* Copyright 2013 Eric Ptak - trouch.com
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+*/
+
+package com.trouch.webiopi.client.devices.sensor;
+
+import com.trouch.webiopi.client.PiClient;
+import com.trouch.webiopi.client.devices.Device;
+
+public class Pressure extends Device {
+
+        public Pressure(PiClient client, String deviceName) {
+                super(client, deviceName, "sensor");
+        }
+
+        public float getHectoPascal() {
+                return Float.parseFloat(this.sendRequest("GET", "/pressure/hpa"));
+        }
+
+        public float getPascal() {
+                return Float.parseFloat(this.sendRequest("GET", "/pressure/pa"));
+        }
+
+}
diff --git a/java/client/src/com/trouch/webiopi/client/devices/sensor/Temperature.java b/java/client/src/com/trouch/webiopi/client/devices/sensor/Temperature.java
new file mode 100644
index 0000000..160e32f
--- /dev/null
+++ b/java/client/src/com/trouch/webiopi/client/devices/sensor/Temperature.java
@@ -0,0 +1,34 @@
+/* Copyright 2013 Eric Ptak - trouch.com
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+*/
+
+package com.trouch.webiopi.client.devices.sensor;
+
+import com.trouch.webiopi.client.PiClient;
+import com.trouch.webiopi.client.devices.Device;
+
+public class Temperature extends Device {
+
+        public Temperature(PiClient client, String deviceName) {
+                super(client, deviceName, "sensor");
+        }
+
+        public float getCelsius() {
+                return Float.parseFloat(this.sendRequest("GET", "/temperature/c"));
+        }
+
+        public float getFahrenheit() {
+                return Float.parseFloat(this.sendRequest("GET", "/temperature/f"));
+        }
+
+}
diff --git a/java/client/src/org/apache/commons/codec/BinaryDecoder.java b/java/client/src/org/apache/commons/codec/BinaryDecoder.java
new file mode 100644
index 0000000..546ff76
--- /dev/null
+++ b/java/client/src/org/apache/commons/codec/BinaryDecoder.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.codec;
+
+/**
+ * Defines common decoding methods for byte array decoders.
+ *
+ * @version $Id$
+ */
+public interface BinaryDecoder extends Decoder {
+
+    /**
+     * Decodes a byte array and returns the results as a byte array.
+     *
+     * @param source
+     *            A byte array which has been encoded with the appropriate encoder
+     * @return a byte array that contains decoded content
+     * @throws DecoderException
+     *             A decoder exception is thrown if a Decoder encounters a failure condition during the decode process.
+     */
+    byte[] decode(byte[] source) throws DecoderException;
+}
+
diff --git a/java/client/src/org/apache/commons/codec/BinaryEncoder.java b/java/client/src/org/apache/commons/codec/BinaryEncoder.java
new file mode 100644
index 0000000..65f92cc
--- /dev/null
+++ b/java/client/src/org/apache/commons/codec/BinaryEncoder.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.codec;
+
+/**
+ * Defines common encoding methods for byte array encoders.
+ *
+ * @version $Id$
+ */
+public interface BinaryEncoder extends Encoder {
+
+    /**
+     * Encodes a byte array and return the encoded data as a byte array.
+     *
+     * @param source
+     *            Data to be encoded
+     * @return A byte array containing the encoded data
+     * @throws EncoderException
+     *             thrown if the Encoder encounters a failure condition during the encoding process.
+     */
+    byte[] encode(byte[] source) throws EncoderException;
+}
+
diff --git a/java/client/src/org/apache/commons/codec/CharEncoding.java b/java/client/src/org/apache/commons/codec/CharEncoding.java
new file mode 100644
index 0000000..2cfafa6
--- /dev/null
+++ b/java/client/src/org/apache/commons/codec/CharEncoding.java
@@ -0,0 +1,113 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.codec;
+
+/**
+ * Character encoding names required of every implementation of the Java platform.
+ *
+ * From the Java documentation <a
+ * href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>:
+ * <p>
+ * <cite>Every implementation of the Java platform is required to support the following character encodings. Consult the
+ * release documentation for your implementation to see if any other encodings are supported. Consult the release
+ * documentation for your implementation to see if any other encodings are supported.</cite>
+ * </p>
+ *
+ * <ul>
+ * <li><code>US-ASCII</code><br/>
+ * Seven-bit ASCII, a.k.a. ISO646-US, a.k.a. the Basic Latin block of the Unicode character set.</li>
+ * <li><code>ISO-8859-1</code><br/>
+ * ISO Latin Alphabet No. 1, a.k.a. ISO-LATIN-1.</li>
+ * <li><code>UTF-8</code><br/>
+ * Eight-bit Unicode Transformation Format.</li>
+ * <li><code>UTF-16BE</code><br/>
+ * Sixteen-bit Unicode Transformation Format, big-endian byte order.</li>
+ * <li><code>UTF-16LE</code><br/>
+ * Sixteen-bit Unicode Transformation Format, little-endian byte order.</li>
+ * <li><code>UTF-16</code><br/>
+ * Sixteen-bit Unicode Transformation Format, byte order specified by a mandatory initial byte-order mark (either order
+ * accepted on input, big-endian used on output.)</li>
+ * </ul>
+ *
+ * This perhaps would best belong in the [lang] project. Even if a similar interface is defined in [lang], it is not
+ * foreseen that [codec] would be made to depend on [lang].
+ *
+ * <p>
+ * This class is immutable and thread-safe.
+ * </p>
+ *
+ * @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @since 1.4
+ * @version $Id$
+ */
+public class CharEncoding {
+    /**
+     * CharEncodingISO Latin Alphabet No. 1, a.k.a. ISO-LATIN-1.
+     * <p>
+     * Every implementation of the Java platform is required to support this character encoding.
+     *
+     * @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+     */
+    public static final String ISO_8859_1 = "ISO-8859-1";
+
+    /**
+     * Seven-bit ASCII, also known as ISO646-US, also known as the Basic Latin block of the Unicode character set.
+     * <p>
+     * Every implementation of the Java platform is required to support this character encoding.
+     *
+     * @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+     */
+    public static final String US_ASCII = "US-ASCII";
+
+    /**
+     * Sixteen-bit Unicode Transformation Format, The byte order specified by a mandatory initial byte-order mark
+     * (either order accepted on input, big-endian used on output)
+     * <p>
+     * Every implementation of the Java platform is required to support this character encoding.
+     *
+     * @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+     */
+    public static final String UTF_16 = "UTF-16";
+
+    /**
+     * Sixteen-bit Unicode Transformation Format, big-endian byte order.
+     * <p>
+     * Every implementation of the Java platform is required to support this character encoding.
+     *
+     * @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+     */
+    public static final String UTF_16BE = "UTF-16BE";
+
+    /**
+     * Sixteen-bit Unicode Transformation Format, little-endian byte order.
+     * <p>
+     * Every implementation of the Java platform is required to support this character encoding.
+     *
+     * @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+     */
+    public static final String UTF_16LE = "UTF-16LE";
+
+    /**
+     * Eight-bit Unicode Transformation Format.
+     * <p>
+     * Every implementation of the Java platform is required to support this character encoding.
+     *
+     * @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+     */
+    public static final String UTF_8 = "UTF-8";
+}
diff --git a/java/client/src/org/apache/commons/codec/Charsets.java b/java/client/src/org/apache/commons/codec/Charsets.java
new file mode 100644
index 0000000..73fbc79
--- /dev/null
+++ b/java/client/src/org/apache/commons/codec/Charsets.java
@@ -0,0 +1,144 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.codec;
+
+import java.nio.charset.Charset;
+
+/**
+ * Charsets required of every implementation of the Java platform.
+ *
+ * From the Java documentation <a href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard
+ * charsets</a>:
+ * <p>
+ * <cite>Every implementation of the Java platform is required to support the following character encodings. Consult the
+ * release documentation for your implementation to see if any other encodings are supported. Consult the release
+ * documentation for your implementation to see if any other encodings are supported. </cite>
+ * </p>
+ *
+ * <ul>
+ * <li><code>US-ASCII</code><br/>
+ * Seven-bit ASCII, a.k.a. ISO646-US, a.k.a. the Basic Latin block of the Unicode character set.</li>
+ * <li><code>ISO-8859-1</code><br/>
+ * ISO Latin Alphabet No. 1, a.k.a. ISO-LATIN-1.</li>
+ * <li><code>UTF-8</code><br/>
+ * Eight-bit Unicode Transformation Format.</li>
+ * <li><code>UTF-16BE</code><br/>
+ * Sixteen-bit Unicode Transformation Format, big-endian byte order.</li>
+ * <li><code>UTF-16LE</code><br/>
+ * Sixteen-bit Unicode Transformation Format, little-endian byte order.</li>
+ * <li><code>UTF-16</code><br/>
+ * Sixteen-bit Unicode Transformation Format, byte order specified by a mandatory initial byte-order mark (either order
+ * accepted on input, big-endian used on output.)</li>
+ * </ul>
+ *
+ * This perhaps would best belong in the Commons Lang project. Even if a similar class is defined in Commons Lang, it is
+ * not foreseen that Commons Codec would be made to depend on Commons Lang.
+ *
+ * <p>
+ * This class is immutable and thread-safe.
+ * </p>
+ *
+ * @see <a href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @since 1.7
+ * @version $Id: CharEncoding.java 1173287 2011-09-20 18:16:19Z ggregory $
+ */
+public class Charsets {
+
+    //
+    // This class should only contain Charset instances for required encodings. This guarantees that it will load
+    // correctly and without delay on all Java platforms.
+    //
+
+    /**
+     * Returns the given Charset or the default Charset if the given Charset is null.
+     *
+     * @param charset
+     *            A charset or null.
+     * @return the given Charset or the default Charset if the given Charset is null
+     */
+    public static Charset toCharset(final Charset charset) {
+        return charset == null ? Charset.defaultCharset() : charset;
+    }
+
+    /**
+     * Returns a Charset for the named charset. If the name is null, return the default Charset.
+     *
+     * @param charset
+     *            The name of the requested charset, may be null.
+     * @return a Charset for the named charset
+     * @throws java.nio.charset.UnsupportedCharsetException
+     *             If the named charset is unavailable
+     */
+    public static Charset toCharset(final String charset) {
+        return charset == null ? Charset.defaultCharset() : Charset.forName(charset);
+    }
+
+    /**
+     * CharEncodingISO Latin Alphabet No. 1, a.k.a. ISO-LATIN-1.
+     * <p>
+     * Every implementation of the Java platform is required to support this character encoding.
+     *
+     * @see <a href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+     */
+    public static final Charset ISO_8859_1 = Charset.forName(CharEncoding.ISO_8859_1);
+
+    /**
+     * Seven-bit ASCII, also known as ISO646-US, also known as the Basic Latin block of the Unicode character set.
+     * <p>
+     * Every implementation of the Java platform is required to support this character encoding.
+     *
+     * @see <a href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+     */
+    public static final Charset US_ASCII = Charset.forName(CharEncoding.US_ASCII);
+
+    /**
+     * Sixteen-bit Unicode Transformation Format, The byte order specified by a mandatory initial byte-order mark
+     * (either order accepted on input, big-endian used on output)
+     * <p>
+     * Every implementation of the Java platform is required to support this character encoding.
+     *
+     * @see <a href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+     */
+    public static final Charset UTF_16 = Charset.forName(CharEncoding.UTF_16);
+
+    /**
+     * Sixteen-bit Unicode Transformation Format, big-endian byte order.
+     * <p>
+     * Every implementation of the Java platform is required to support this character encoding.
+     *
+     * @see <a href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+     */
+    public static final Charset UTF_16BE = Charset.forName(CharEncoding.UTF_16BE);
+
+    /**
+     * Sixteen-bit Unicode Transformation Format, little-endian byte order.
+     * <p>
+     * Every implementation of the Java platform is required to support this character encoding.
+     *
+     * @see <a href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+     */
+    public static final Charset UTF_16LE = Charset.forName(CharEncoding.UTF_16LE);
+
+    /**
+     * Eight-bit Unicode Transformation Format.
+     * <p>
+     * Every implementation of the Java platform is required to support this character encoding.
+     *
+     * @see <a href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+     */
+    public static final Charset UTF_8 = Charset.forName(CharEncoding.UTF_8);
+}
diff --git a/java/client/src/org/apache/commons/codec/Decoder.java b/java/client/src/org/apache/commons/codec/Decoder.java
new file mode 100644
index 0000000..9f3ba60
--- /dev/null
+++ b/java/client/src/org/apache/commons/codec/Decoder.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.codec;
+
+/**
+ * Provides the highest level of abstraction for Decoders.
+ * <p>
+ * This is the sister interface of {@link Encoder}. All Decoders implement this common generic interface.
+ * Allows a user to pass a generic Object to any Decoder implementation in the codec package.
+ * <p>
+ * One of the two interfaces at the center of the codec package.
+ *
+ * @version $Id$
+ */
+public interface Decoder {
+
+    /**
+     * Decodes an "encoded" Object and returns a "decoded" Object. Note that the implementation of this interface will
+     * try to cast the Object parameter to the specific type expected by a particular Decoder implementation. If a
+     * {@link ClassCastException} occurs this decode method will throw a DecoderException.
+     *
+     * @param source
+     *            the object to decode
+     * @return a 'decoded" object
+     * @throws DecoderException
+     *             a decoder exception can be thrown for any number of reasons. Some good candidates are that the
+     *             parameter passed to this method is null, a param cannot be cast to the appropriate type for a
+     *             specific encoder.
+     */
+    Object decode(Object source) throws DecoderException;
+}
+
diff --git a/java/client/src/org/apache/commons/codec/DecoderException.java b/java/client/src/org/apache/commons/codec/DecoderException.java
new file mode 100644
index 0000000..52846a5
--- /dev/null
+++ b/java/client/src/org/apache/commons/codec/DecoderException.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.codec;
+
+/**
+ * Thrown when there is a failure condition during the decoding process. This exception is thrown when a {@link Decoder}
+ * encounters a decoding specific exception such as invalid data, or characters outside of the expected range.
+ *
+ * @version $Id$
+ */
+public class DecoderException extends Exception {
+
+    /**
+     * Declares the Serial Version Uid.
+     *
+     * @see <a href="http://c2.com/cgi/wiki?AlwaysDeclareSerialVersionUid">Always Declare Serial Version Uid</a>
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new exception with {@code null} as its detail message. The cause is not initialized, and may
+     * subsequently be initialized by a call to {@link #initCause}.
+     *
+     * @since 1.4
+     */
+    public DecoderException() {
+        super();
+    }
+
+    /**
+     * Constructs a new exception with the specified detail message. The cause is not initialized, and may subsequently
+     * be initialized by a call to {@link #initCause}.
+     *
+     * @param message
+     *            The detail message which is saved for later retrieval by the {@link #getMessage()} method.
+     */
+    public DecoderException(final String message) {
+        super(message);
+    }
+
+    /**
+     * Constructs a new exception with the specified detail message and cause.
+     * <p>
+     * Note that the detail message associated with <code>cause</code> is not automatically incorporated into this
+     * exception's detail message.
+     *
+     * @param message
+     *            The detail message which is saved for later retrieval by the {@link #getMessage()} method.
+     * @param cause
+     *            The cause which is saved for later retrieval by the {@link #getCause()} method. A {@code null}
+     *            value is permitted, and indicates that the cause is nonexistent or unknown.
+     * @since 1.4
+     */
+    public DecoderException(final String message, final Throwable cause) {
+        super(message, cause);
+    }
+
+    /**
+     * Constructs a new exception with the specified cause and a detail message of <code>(cause==null ?
+     * null : cause.toString())</code> (which typically contains the class and detail message of <code>cause</code>).
+     * This constructor is useful for exceptions that are little more than wrappers for other throwables.
+     *
+     * @param cause
+     *            The cause which is saved for later retrieval by the {@link #getCause()} method. A {@code null}
+     *            value is permitted, and indicates that the cause is nonexistent or unknown.
+     * @since 1.4
+     */
+    public DecoderException(final Throwable cause) {
+        super(cause);
+    }
+}
diff --git a/java/client/src/org/apache/commons/codec/Encoder.java b/java/client/src/org/apache/commons/codec/Encoder.java
new file mode 100644
index 0000000..c7e99eb
--- /dev/null
+++ b/java/client/src/org/apache/commons/codec/Encoder.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.codec;
+
+/**
+ * Provides the highest level of abstraction for Encoders.
+ * <p>
+ * This is the sister interface of {@link Decoder}.  Every implementation of Encoder provides this
+ * common generic interface which allows a user to pass a generic Object to any Encoder implementation
+ * in the codec package.
+ *
+ * @version $Id$
+ */
+public interface Encoder {
+
+    /**
+     * Encodes an "Object" and returns the encoded content as an Object. The Objects here may just be
+     * <code>byte[]</code> or <code>String</code>s depending on the implementation used.
+     *
+     * @param source
+     *            An object to encode
+     * @return An "encoded" Object
+     * @throws EncoderException
+     *             An encoder exception is thrown if the encoder experiences a failure condition during the encoding
+     *             process.
+     */
+    Object encode(Object source) throws EncoderException;
+}
+
diff --git a/java/client/src/org/apache/commons/codec/EncoderException.java b/java/client/src/org/apache/commons/codec/EncoderException.java
new file mode 100644
index 0000000..dfc88f7
--- /dev/null
+++ b/java/client/src/org/apache/commons/codec/EncoderException.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.codec;
+
+/**
+ * Thrown when there is a failure condition during the encoding process. This exception is thrown when an
+ * {@link Encoder} encounters a encoding specific exception such as invalid data, inability to calculate a checksum,
+ * characters outside of the expected range.
+ *
+ * @version $Id$
+ */
+public class EncoderException extends Exception {
+
+    /**
+     * Declares the Serial Version Uid.
+     *
+     * @see <a href="http://c2.com/cgi/wiki?AlwaysDeclareSerialVersionUid">Always Declare Serial Version Uid</a>
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new exception with {@code null} as its detail message. The cause is not initialized, and may
+     * subsequently be initialized by a call to {@link #initCause}.
+     *
+     * @since 1.4
+     */
+    public EncoderException() {
+        super();
+    }
+
+    /**
+     * Constructs a new exception with the specified detail message. The cause is not initialized, and may subsequently
+     * be initialized by a call to {@link #initCause}.
+     *
+     * @param message
+     *            a useful message relating to the encoder specific error.
+     */
+    public EncoderException(final String message) {
+        super(message);
+    }
+
+    /**
+     * Constructs a new exception with the specified detail message and cause.
+     *
+     * <p>
+     * Note that the detail message associated with <code>cause</code> is not automatically incorporated into this
+     * exception's detail message.
+     * </p>
+     *
+     * @param message
+     *            The detail message which is saved for later retrieval by the {@link #getMessage()} method.
+     * @param cause
+     *            The cause which is saved for later retrieval by the {@link #getCause()} method. A {@code null}
+     *            value is permitted, and indicates that the cause is nonexistent or unknown.
+     * @since 1.4
+     */
+    public EncoderException(final String message, final Throwable cause) {
+        super(message, cause);
+    }
+
+    /**
+     * Constructs a new exception with the specified cause and a detail message of <code>(cause==null ?
+     * null : cause.toString())</code> (which typically contains the class and detail message of <code>cause</code>).
+     * This constructor is useful for exceptions that are little more than wrappers for other throwables.
+     *
+     * @param cause
+     *            The cause which is saved for later retrieval by the {@link #getCause()} method. A {@code null}
+     *            value is permitted, and indicates that the cause is nonexistent or unknown.
+     * @since 1.4
+     */
+    public EncoderException(final Throwable cause) {
+        super(cause);
+    }
+}
diff --git a/java/client/src/org/apache/commons/codec/binary/Base64.java b/java/client/src/org/apache/commons/codec/binary/Base64.java
new file mode 100644
index 0000000..3e01916
--- /dev/null
+++ b/java/client/src/org/apache/commons/codec/binary/Base64.java
@@ -0,0 +1,775 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.codec.binary;
+
+import java.math.BigInteger;
+
+/**
+ * Provides Base64 encoding and decoding as defined by <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>.
+ *
+ * <p>
+ * This class implements section <cite>6.8. Base64 Content-Transfer-Encoding</cite> from RFC 2045 <cite>Multipurpose
+ * Internet Mail Extensions (MIME) Part One: Format of Internet Message Bodies</cite> by Freed and Borenstein.
+ * </p>
+ * <p>
+ * The class can be parameterized in the following manner with various constructors:
+ * <ul>
+ * <li>URL-safe mode: Default off.</li>
+ * <li>Line length: Default 76. Line length that aren't multiples of 4 will still essentially end up being multiples of
+ * 4 in the encoded data.
+ * <li>Line separator: Default is CRLF ("\r\n")</li>
+ * </ul>
+ * </p>
+ * <p>
+ * Since this class operates directly on byte streams, and not character streams, it is hard-coded to only
+ * encode/decode character encodings which are compatible with the lower 127 ASCII chart (ISO-8859-1, Windows-1252,
+ * UTF-8, etc).
+ * </p>
+ * <p>
+ * This class is thread-safe.
+ * </p>
+ *
+ * @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>
+ * @since 1.0
+ * @version $Id$
+ */
+public class Base64 extends BaseNCodec {
+
+    /**
+     * BASE32 characters are 6 bits in length.
+     * They are formed by taking a block of 3 octets to form a 24-bit string,
+     * which is converted into 4 BASE64 characters.
+     */
+    private static final int BITS_PER_ENCODED_BYTE = 6;
+    private static final int BYTES_PER_UNENCODED_BLOCK = 3;
+    private static final int BYTES_PER_ENCODED_BLOCK = 4;
+
+    /**
+     * Chunk separator per RFC 2045 section 2.1.
+     *
+     * <p>
+     * N.B. The next major release may break compatibility and make this field private.
+     * </p>
+     *
+     * @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045 section 2.1</a>
+     */
+    static final byte[] CHUNK_SEPARATOR = {'\r', '\n'};
+
+    /**
+     * This array is a lookup table that translates 6-bit positive integer index values into their "Base64 Alphabet"
+     * equivalents as specified in Table 1 of RFC 2045.
+     *
+     * Thanks to "commons" project in ws.apache.org for this code.
+     * http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/
+     */
+    private static final byte[] STANDARD_ENCODE_TABLE = {
+            'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+            'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+            'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+            'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+            '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/'
+    };
+
+    /**
+     * This is a copy of the STANDARD_ENCODE_TABLE above, but with + and /
+     * changed to - and _ to make the encoded Base64 results more URL-SAFE.
+     * This table is only used when the Base64's mode is set to URL-SAFE.
+     */
+    private static final byte[] URL_SAFE_ENCODE_TABLE = {
+            'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+            'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+            'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+            'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+            '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '_'
+    };
+
+    /**
+     * This array is a lookup table that translates Unicode characters drawn from the "Base64 Alphabet" (as specified
+     * in Table 1 of RFC 2045) into their 6-bit positive integer equivalents. Characters that are not in the Base64
+     * alphabet but fall within the bounds of the array are translated to -1.
+     *
+     * Note: '+' and '-' both decode to 62. '/' and '_' both decode to 63. This means decoder seamlessly handles both
+     * URL_SAFE and STANDARD base64. (The encoder, on the other hand, needs to know ahead of time what to emit).
+     *
+     * Thanks to "commons" project in ws.apache.org for this code.
+     * http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/
+     */
+    private static final byte[] DECODE_TABLE = {
+            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, 62, -1, 63, 52, 53, 54,
+            55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4,
+            5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+            24, 25, -1, -1, -1, -1, 63, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+            35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51
+    };
+
+    /**
+     * Base64 uses 6-bit fields.
+     */
+    /** Mask used to extract 6 bits, used when encoding */
+    private static final int MASK_6BITS = 0x3f;
+
+    // The static final fields above are used for the original static byte[] methods on Base64.
+    // The private member fields below are used with the new streaming approach, which requires
+    // some state be preserved between calls of encode() and decode().
+
+    /**
+     * Encode table to use: either STANDARD or URL_SAFE. Note: the DECODE_TABLE above remains static because it is able
+     * to decode both STANDARD and URL_SAFE streams, but the encodeTable must be a member variable so we can switch
+     * between the two modes.
+     */
+    private final byte[] encodeTable;
+
+    // Only one decode table currently; keep for consistency with Base32 code
+    private final byte[] decodeTable = DECODE_TABLE;
+
+    /**
+     * Line separator for encoding. Not used when decoding. Only used if lineLength > 0.
+     */
+    private final byte[] lineSeparator;
+
+    /**
+     * Convenience variable to help us determine when our buffer is going to run out of room and needs resizing.
+     * <code>decodeSize = 3 + lineSeparator.length;</code>
+     */
+    private final int decodeSize;
+
+    /**
+     * Convenience variable to help us determine when our buffer is going to run out of room and needs resizing.
+     * <code>encodeSize = 4 + lineSeparator.length;</code>
+     */
+    private final int encodeSize;
+
+    /**
+     * Creates a Base64 codec used for decoding (all modes) and encoding in URL-unsafe mode.
+     * <p>
+     * When encoding the line length is 0 (no chunking), and the encoding table is STANDARD_ENCODE_TABLE.
+     * </p>
+     *
+     * <p>
+     * When decoding all variants are supported.
+     * </p>
+     */
+    public Base64() {
+        this(0);
+    }
+
+    /**
+     * Creates a Base64 codec used for decoding (all modes) and encoding in the given URL-safe mode.
+     * <p>
+     * When encoding the line length is 76, the line separator is CRLF, and the encoding table is
+     * STANDARD_ENCODE_TABLE.
+     * </p>
+     *
+     * <p>
+     * When decoding all variants are supported.
+     * </p>
+     *
+     * @param urlSafe
+     *            if {@code true}, URL-safe encoding is used. In most cases this should be set to {@code false}.
+     * @since 1.4
+     */
+    public Base64(final boolean urlSafe) {
+        this(MIME_CHUNK_SIZE, CHUNK_SEPARATOR, urlSafe);
+    }
+
+    /**
+     * Creates a Base64 codec used for decoding (all modes) and encoding in URL-unsafe mode.
+     * <p>
+     * When encoding the line length is given in the constructor, the line separator is CRLF, and the encoding table is
+     * STANDARD_ENCODE_TABLE.
+     * </p>
+     * <p>
+     * Line lengths that aren't multiples of 4 will still essentially end up being multiples of 4 in the encoded data.
+     * </p>
+     * <p>
+     * When decoding all variants are supported.
+     * </p>
+     *
+     * @param lineLength
+     *            Each line of encoded data will be at most of the given length (rounded down to nearest multiple of
+     *            4). If lineLength <= 0, then the output will not be divided into lines (chunks). Ignored when
+     *            decoding.
+     * @since 1.4
+     */
+    public Base64(final int lineLength) {
+        this(lineLength, CHUNK_SEPARATOR);
+    }
+
+    /**
+     * Creates a Base64 codec used for decoding (all modes) and encoding in URL-unsafe mode.
+     * <p>
+     * When encoding the line length and line separator are given in the constructor, and the encoding table is
+     * STANDARD_ENCODE_TABLE.
+     * </p>
+     * <p>
+     * Line lengths that aren't multiples of 4 will still essentially end up being multiples of 4 in the encoded data.
+     * </p>
+     * <p>
+     * When decoding all variants are supported.
+     * </p>
+     *
+     * @param lineLength
+     *            Each line of encoded data will be at most of the given length (rounded down to nearest multiple of
+     *            4). If lineLength <= 0, then the output will not be divided into lines (chunks). Ignored when
+     *            decoding.
+     * @param lineSeparator
+     *            Each line of encoded data will end with this sequence of bytes.
+     * @throws IllegalArgumentException
+     *             Thrown when the provided lineSeparator included some base64 characters.
+     * @since 1.4
+     */
+    public Base64(final int lineLength, final byte[] lineSeparator) {
+        this(lineLength, lineSeparator, false);
+    }
+
+    /**
+     * Creates a Base64 codec used for decoding (all modes) and encoding in URL-unsafe mode.
+     * <p>
+     * When encoding the line length and line separator are given in the constructor, and the encoding table is
+     * STANDARD_ENCODE_TABLE.
+     * </p>
+     * <p>
+     * Line lengths that aren't multiples of 4 will still essentially end up being multiples of 4 in the encoded data.
+     * </p>
+     * <p>
+     * When decoding all variants are supported.
+     * </p>
+     *
+     * @param lineLength
+     *            Each line of encoded data will be at most of the given length (rounded down to nearest multiple of
+     *            4). If lineLength <= 0, then the output will not be divided into lines (chunks). Ignored when
+     *            decoding.
+     * @param lineSeparator
+     *            Each line of encoded data will end with this sequence of bytes.
+     * @param urlSafe
+     *            Instead of emitting '+' and '/' we emit '-' and '_' respectively. urlSafe is only applied to encode
+     *            operations. Decoding seamlessly handles both modes.
+     *            <b>Note: no padding is added when using the URL-safe alphabet.</b>
+     * @throws IllegalArgumentException
+     *             The provided lineSeparator included some base64 characters. That's not going to work!
+     * @since 1.4
+     */
+    public Base64(final int lineLength, final byte[] lineSeparator, final boolean urlSafe) {
+        super(BYTES_PER_UNENCODED_BLOCK, BYTES_PER_ENCODED_BLOCK,
+                lineLength,
+                lineSeparator == null ? 0 : lineSeparator.length);
+        // TODO could be simplified if there is no requirement to reject invalid line sep when length <=0
+        // @see test case Base64Test.testConstructors()
+        if (lineSeparator != null) {
+            if (containsAlphabetOrPad(lineSeparator)) {
+                final String sep = StringUtils.newStringUtf8(lineSeparator);
+                throw new IllegalArgumentException("lineSeparator must not contain base64 characters: [" + sep + "]");
+            }
+            if (lineLength > 0){ // null line-sep forces no chunking rather than throwing IAE
+                this.encodeSize = BYTES_PER_ENCODED_BLOCK + lineSeparator.length;
+                this.lineSeparator = new byte[lineSeparator.length];
+                System.arraycopy(lineSeparator, 0, this.lineSeparator, 0, lineSeparator.length);
+            } else {
+                this.encodeSize = BYTES_PER_ENCODED_BLOCK;
+                this.lineSeparator = null;
+            }
+        } else {
+            this.encodeSize = BYTES_PER_ENCODED_BLOCK;
+            this.lineSeparator = null;
+        }
+        this.decodeSize = this.encodeSize - 1;
+        this.encodeTable = urlSafe ? URL_SAFE_ENCODE_TABLE : STANDARD_ENCODE_TABLE;
+    }
+
+    /**
+     * Returns our current encode mode. True if we're URL-SAFE, false otherwise.
+     *
+     * @return true if we're in URL-SAFE mode, false otherwise.
+     * @since 1.4
+     */
+    public boolean isUrlSafe() {
+        return this.encodeTable == URL_SAFE_ENCODE_TABLE;
+    }
+
+    /**
+     * <p>
+     * Encodes all of the provided data, starting at inPos, for inAvail bytes. Must be called at least twice: once with
+     * the data to encode, and once with inAvail set to "-1" to alert encoder that EOF has been reached, to flush last
+     * remaining bytes (if not multiple of 3).
+     * </p>
+     * <p><b>Note: no padding is added when encoding using the URL-safe alphabet.</b></p>
+     * <p>
+     * Thanks to "commons" project in ws.apache.org for the bitwise operations, and general approach.
+     * http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/
+     * </p>
+     *
+     * @param in
+     *            byte[] array of binary data to base64 encode.
+     * @param inPos
+     *            Position to start reading data from.
+     * @param inAvail
+     *            Amount of bytes available from input for encoding.
+     * @param context
+     *            the context to be used
+     */
+    @Override
+    void encode(final byte[] in, int inPos, final int inAvail, final Context context) {
+        if (context.eof) {
+            return;
+        }
+        // inAvail < 0 is how we're informed of EOF in the underlying data we're
+        // encoding.
+        if (inAvail < 0) {
+            context.eof = true;
+            if (0 == context.modulus && lineLength == 0) {
+                return; // no leftovers to process and not using chunking
+            }
+            final byte[] buffer = ensureBufferSize(encodeSize, context);
+            final int savedPos = context.pos;
+            switch (context.modulus) { // 0-2
+                case 0 : // nothing to do here
+                    break;
+                case 1 : // 8 bits = 6 + 2
+                    // top 6 bits:
+                    buffer[context.pos++] = encodeTable[(context.ibitWorkArea >> 2) & MASK_6BITS];
+                    // remaining 2:
+                    buffer[context.pos++] = encodeTable[(context.ibitWorkArea << 4) & MASK_6BITS];
+                    // URL-SAFE skips the padding to further reduce size.
+                    if (encodeTable == STANDARD_ENCODE_TABLE) {
+                        buffer[context.pos++] = PAD;
+                        buffer[context.pos++] = PAD;
+                    }
+                    break;
+
+                case 2 : // 16 bits = 6 + 6 + 4
+                    buffer[context.pos++] = encodeTable[(context.ibitWorkArea >> 10) & MASK_6BITS];
+                    buffer[context.pos++] = encodeTable[(context.ibitWorkArea >> 4) & MASK_6BITS];
+                    buffer[context.pos++] = encodeTable[(context.ibitWorkArea << 2) & MASK_6BITS];
+                    // URL-SAFE skips the padding to further reduce size.
+                    if (encodeTable == STANDARD_ENCODE_TABLE) {
+                        buffer[context.pos++] = PAD;
+                    }
+                    break;
+                default:
+                    throw new IllegalStateException("Impossible modulus "+context.modulus);
+            }
+            context.currentLinePos += context.pos - savedPos; // keep track of current line position
+            // if currentPos == 0 we are at the start of a line, so don't add CRLF
+            if (lineLength > 0 && context.currentLinePos > 0) {
+                System.arraycopy(lineSeparator, 0, buffer, context.pos, lineSeparator.length);
+                context.pos += lineSeparator.length;
+            }
+        } else {
+            for (int i = 0; i < inAvail; i++) {
+                final byte[] buffer = ensureBufferSize(encodeSize, context);
+                context.modulus = (context.modulus+1) % BYTES_PER_UNENCODED_BLOCK;
+                int b = in[inPos++];
+                if (b < 0) {
+                    b += 256;
+                }
+                context.ibitWorkArea = (context.ibitWorkArea << 8) + b; //  BITS_PER_BYTE
+                if (0 == context.modulus) { // 3 bytes = 24 bits = 4 * 6 bits to extract
+                    buffer[context.pos++] = encodeTable[(context.ibitWorkArea >> 18) & MASK_6BITS];
+                    buffer[context.pos++] = encodeTable[(context.ibitWorkArea >> 12) & MASK_6BITS];
+                    buffer[context.pos++] = encodeTable[(context.ibitWorkArea >> 6) & MASK_6BITS];
+                    buffer[context.pos++] = encodeTable[context.ibitWorkArea & MASK_6BITS];
+                    context.currentLinePos += BYTES_PER_ENCODED_BLOCK;
+                    if (lineLength > 0 && lineLength <= context.currentLinePos) {
+                        System.arraycopy(lineSeparator, 0, buffer, context.pos, lineSeparator.length);
+                        context.pos += lineSeparator.length;
+                        context.currentLinePos = 0;
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * <p>
+     * Decodes all of the provided data, starting at inPos, for inAvail bytes. Should be called at least twice: once
+     * with the data to decode, and once with inAvail set to "-1" to alert decoder that EOF has been reached. The "-1"
+     * call is not necessary when decoding, but it doesn't hurt, either.
+     * </p>
+     * <p>
+     * Ignores all non-base64 characters. This is how chunked (e.g. 76 character) data is handled, since CR and LF are
+     * silently ignored, but has implications for other bytes, too. This method subscribes to the garbage-in,
+     * garbage-out philosophy: it will not check the provided data for validity.
+     * </p>
+     * <p>
+     * Thanks to "commons" project in ws.apache.org for the bitwise operations, and general approach.
+     * http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/
+     * </p>
+     *
+     * @param in
+     *            byte[] array of ascii data to base64 decode.
+     * @param inPos
+     *            Position to start reading data from.
+     * @param inAvail
+     *            Amount of bytes available from input for encoding.
+     * @param context
+     *            the context to be used
+     */
+    @Override
+    void decode(final byte[] in, int inPos, final int inAvail, final Context context) {
+        if (context.eof) {
+            return;
+        }
+        if (inAvail < 0) {
+            context.eof = true;
+        }
+        for (int i = 0; i < inAvail; i++) {
+            final byte[] buffer = ensureBufferSize(decodeSize, context);
+            final byte b = in[inPos++];
+            if (b == PAD) {
+                // We're done.
+                context.eof = true;
+                break;
+            } else {
+                if (b >= 0 && b < DECODE_TABLE.length) {
+                    final int result = DECODE_TABLE[b];
+                    if (result >= 0) {
+                        context.modulus = (context.modulus+1) % BYTES_PER_ENCODED_BLOCK;
+                        context.ibitWorkArea = (context.ibitWorkArea << BITS_PER_ENCODED_BYTE) + result;
+                        if (context.modulus == 0) {
+                            buffer[context.pos++] = (byte) ((context.ibitWorkArea >> 16) & MASK_8BITS);
+                            buffer[context.pos++] = (byte) ((context.ibitWorkArea >> 8) & MASK_8BITS);
+                            buffer[context.pos++] = (byte) (context.ibitWorkArea & MASK_8BITS);
+                        }
+                    }
+                }
+            }
+        }
+
+        // Two forms of EOF as far as base64 decoder is concerned: actual
+        // EOF (-1) and first time '=' character is encountered in stream.
+        // This approach makes the '=' padding characters completely optional.
+        if (context.eof && context.modulus != 0) {
+            final byte[] buffer = ensureBufferSize(decodeSize, context);
+
+            // We have some spare bits remaining
+            // Output all whole multiples of 8 bits and ignore the rest
+            switch (context.modulus) {
+//              case 0 : // impossible, as excluded above
+                case 1 : // 6 bits - ignore entirely
+                    // TODO not currently tested; perhaps it is impossible?
+                    break;
+                case 2 : // 12 bits = 8 + 4
+                    context.ibitWorkArea = context.ibitWorkArea >> 4; // dump the extra 4 bits
+                    buffer[context.pos++] = (byte) ((context.ibitWorkArea) & MASK_8BITS);
+                    break;
+                case 3 : // 18 bits = 8 + 8 + 2
+                    context.ibitWorkArea = context.ibitWorkArea >> 2; // dump 2 bits
+                    buffer[context.pos++] = (byte) ((context.ibitWorkArea >> 8) & MASK_8BITS);
+                    buffer[context.pos++] = (byte) ((context.ibitWorkArea) & MASK_8BITS);
+                    break;
+                default:
+                    throw new IllegalStateException("Impossible modulus "+context.modulus);
+            }
+        }
+    }
+
+    /**
+     * Tests a given byte array to see if it contains only valid characters within the Base64 alphabet. Currently the
+     * method treats whitespace as valid.
+     *
+     * @param arrayOctet
+     *            byte array to test
+     * @return {@code true} if all bytes are valid characters in the Base64 alphabet or if the byte array is empty;
+     *         {@code false}, otherwise
+     * @deprecated 1.5 Use {@link #isBase64(byte[])}, will be removed in 2.0.
+     */
+    @Deprecated
+    public static boolean isArrayByteBase64(final byte[] arrayOctet) {
+        return isBase64(arrayOctet);
+    }
+
+    /**
+     * Returns whether or not the <code>octet</code> is in the base 64 alphabet.
+     *
+     * @param octet
+     *            The value to test
+     * @return {@code true} if the value is defined in the the base 64 alphabet, {@code false} otherwise.
+     * @since 1.4
+     */
+    public static boolean isBase64(final byte octet) {
+        return octet == PAD_DEFAULT || (octet >= 0 && octet < DECODE_TABLE.length && DECODE_TABLE[octet] != -1);
+    }
+
+    /**
+     * Tests a given String to see if it contains only valid characters within the Base64 alphabet. Currently the
+     * method treats whitespace as valid.
+     *
+     * @param base64
+     *            String to test
+     * @return {@code true} if all characters in the String are valid characters in the Base64 alphabet or if
+     *         the String is empty; {@code false}, otherwise
+     *  @since 1.5
+     */
+    public static boolean isBase64(final String base64) {
+        return isBase64(StringUtils.getBytesUtf8(base64));
+    }
+
+    /**
+     * Tests a given byte array to see if it contains only valid characters within the Base64 alphabet. Currently the
+     * method treats whitespace as valid.
+     *
+     * @param arrayOctet
+     *            byte array to test
+     * @return {@code true} if all bytes are valid characters in the Base64 alphabet or if the byte array is empty;
+     *         {@code false}, otherwise
+     * @since 1.5
+     */
+    public static boolean isBase64(final byte[] arrayOctet) {
+        for (int i = 0; i < arrayOctet.length; i++) {
+            if (!isBase64(arrayOctet[i]) && !isWhiteSpace(arrayOctet[i])) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Encodes binary data using the base64 algorithm but does not chunk the output.
+     *
+     * @param binaryData
+     *            binary data to encode
+     * @return byte[] containing Base64 characters in their UTF-8 representation.
+     */
+    public static byte[] encodeBase64(final byte[] binaryData) {
+        return encodeBase64(binaryData, false);
+    }
+
+    /**
+     * Encodes binary data using the base64 algorithm but does not chunk the output.
+     *
+     * NOTE:  We changed the behaviour of this method from multi-line chunking (commons-codec-1.4) to
+     * single-line non-chunking (commons-codec-1.5).
+     *
+     * @param binaryData
+     *            binary data to encode
+     * @return String containing Base64 characters.
+     * @since 1.4 (NOTE:  1.4 chunked the output, whereas 1.5 does not).
+     */
+    public static String encodeBase64String(final byte[] binaryData) {
+        return StringUtils.newStringUtf8(encodeBase64(binaryData, false));
+    }
+
+    /**
+     * Encodes binary data using a URL-safe variation of the base64 algorithm but does not chunk the output. The
+     * url-safe variation emits - and _ instead of + and / characters.
+     * <b>Note: no padding is added.</b>
+     * @param binaryData
+     *            binary data to encode
+     * @return byte[] containing Base64 characters in their UTF-8 representation.
+     * @since 1.4
+     */
+    public static byte[] encodeBase64URLSafe(final byte[] binaryData) {
+        return encodeBase64(binaryData, false, true);
+    }
+
+    /**
+     * Encodes binary data using a URL-safe variation of the base64 algorithm but does not chunk the output. The
+     * url-safe variation emits - and _ instead of + and / characters.
+     * <b>Note: no padding is added.</b>
+     * @param binaryData
+     *            binary data to encode
+     * @return String containing Base64 characters
+     * @since 1.4
+     */
+    public static String encodeBase64URLSafeString(final byte[] binaryData) {
+        return StringUtils.newStringUtf8(encodeBase64(binaryData, false, true));
+    }
+
+    /**
+     * Encodes binary data using the base64 algorithm and chunks the encoded output into 76 character blocks
+     *
+     * @param binaryData
+     *            binary data to encode
+     * @return Base64 characters chunked in 76 character blocks
+     */
+    public static byte[] encodeBase64Chunked(final byte[] binaryData) {
+        return encodeBase64(binaryData, true);
+    }
+
+    /**
+     * Encodes binary data using the base64 algorithm, optionally chunking the output into 76 character blocks.
+     *
+     * @param binaryData
+     *            Array containing binary data to encode.
+     * @param isChunked
+     *            if {@code true} this encoder will chunk the base64 output into 76 character blocks
+     * @return Base64-encoded data.
+     * @throws IllegalArgumentException
+     *             Thrown when the input array needs an output array bigger than {@link Integer#MAX_VALUE}
+     */
+    public static byte[] encodeBase64(final byte[] binaryData, final boolean isChunked) {
+        return encodeBase64(binaryData, isChunked, false);
+    }
+
+    /**
+     * Encodes binary data using the base64 algorithm, optionally chunking the output into 76 character blocks.
+     *
+     * @param binaryData
+     *            Array containing binary data to encode.
+     * @param isChunked
+     *            if {@code true} this encoder will chunk the base64 output into 76 character blocks
+     * @param urlSafe
+     *            if {@code true} this encoder will emit - and _ instead of the usual + and / characters.
+     *            <b>Note: no padding is added when encoding using the URL-safe alphabet.</b>
+     * @return Base64-encoded data.
+     * @throws IllegalArgumentException
+     *             Thrown when the input array needs an output array bigger than {@link Integer#MAX_VALUE}
+     * @since 1.4
+     */
+    public static byte[] encodeBase64(final byte[] binaryData, final boolean isChunked, final boolean urlSafe) {
+        return encodeBase64(binaryData, isChunked, urlSafe, Integer.MAX_VALUE);
+    }
+
+    /**
+     * Encodes binary data using the base64 algorithm, optionally chunking the output into 76 character blocks.
+     *
+     * @param binaryData
+     *            Array containing binary data to encode.
+     * @param isChunked
+     *            if {@code true} this encoder will chunk the base64 output into 76 character blocks
+     * @param urlSafe
+     *            if {@code true} this encoder will emit - and _ instead of the usual + and / characters.
+     *            <b>Note: no padding is added when encoding using the URL-safe alphabet.</b>
+     * @param maxResultSize
+     *            The maximum result size to accept.
+     * @return Base64-encoded data.
+     * @throws IllegalArgumentException
+     *             Thrown when the input array needs an output array bigger than maxResultSize
+     * @since 1.4
+     */
+    public static byte[] encodeBase64(final byte[] binaryData, final boolean isChunked,
+                                      final boolean urlSafe, final int maxResultSize) {
+        if (binaryData == null || binaryData.length == 0) {
+            return binaryData;
+        }
+
+        // Create this so can use the super-class method
+        // Also ensures that the same roundings are performed by the ctor and the code
+        final Base64 b64 = isChunked ? new Base64(urlSafe) : new Base64(0, CHUNK_SEPARATOR, urlSafe);
+        final long len = b64.getEncodedLength(binaryData);
+        if (len > maxResultSize) {
+            throw new IllegalArgumentException("Input array too big, the output array would be bigger (" +
+                len +
+                ") than the specified maximum size of " +
+                maxResultSize);
+        }
+
+        return b64.encode(binaryData);
+    }
+
+    /**
+     * Decodes a Base64 String into octets
+     *
+     * @param base64String
+     *            String containing Base64 data
+     * @return Array containing decoded data.
+     * @since 1.4
+     */
+    public static byte[] decodeBase64(final String base64String) {
+        return new Base64().decode(base64String);
+    }
+
+    /**
+     * Decodes Base64 data into octets
+     *
+     * @param base64Data
+     *            Byte array containing Base64 data
+     * @return Array containing decoded data.
+     */
+    public static byte[] decodeBase64(final byte[] base64Data) {
+        return new Base64().decode(base64Data);
+    }
+
+    // Implementation of the Encoder Interface
+
+    // Implementation of integer encoding used for crypto
+    /**
+     * Decodes a byte64-encoded integer according to crypto standards such as W3C's XML-Signature
+     *
+     * @param pArray
+     *            a byte array containing base64 character data
+     * @return A BigInteger
+     * @since 1.4
+     */
+    public static BigInteger decodeInteger(final byte[] pArray) {
+        return new BigInteger(1, decodeBase64(pArray));
+    }
+
+    /**
+     * Encodes to a byte64-encoded integer according to crypto standards such as W3C's XML-Signature
+     *
+     * @param bigInt
+     *            a BigInteger
+     * @return A byte array containing base64 character data
+     * @throws NullPointerException
+     *             if null is passed in
+     * @since 1.4
+     */
+    public static byte[] encodeInteger(final BigInteger bigInt) {
+        if (bigInt == null) {
+            throw new NullPointerException("encodeInteger called with null parameter");
+        }
+        return encodeBase64(toIntegerBytes(bigInt), false);
+    }
+
+    /**
+     * Returns a byte-array representation of a <code>BigInteger</code> without sign bit.
+     *
+     * @param bigInt
+     *            <code>BigInteger</code> to be converted
+     * @return a byte array representation of the BigInteger parameter
+     */
+    static byte[] toIntegerBytes(final BigInteger bigInt) {
+        int bitlen = bigInt.bitLength();
+        // round bitlen
+        bitlen = ((bitlen + 7) >> 3) << 3;
+        final byte[] bigBytes = bigInt.toByteArray();
+
+        if (((bigInt.bitLength() % 8) != 0) && (((bigInt.bitLength() / 8) + 1) == (bitlen / 8))) {
+            return bigBytes;
+        }
+        // set up params for copying everything but sign bit
+        int startSrc = 0;
+        int len = bigBytes.length;
+
+        // if bigInt is exactly byte-aligned, just skip signbit in copy
+        if ((bigInt.bitLength() % 8) == 0) {
+            startSrc = 1;
+            len--;
+        }
+        final int startDst = bitlen / 8 - len; // to pad w/ nulls as per spec
+        final byte[] resizedBytes = new byte[bitlen / 8];
+        System.arraycopy(bigBytes, startSrc, resizedBytes, startDst, len);
+        return resizedBytes;
+    }
+
+    /**
+     * Returns whether or not the <code>octet</code> is in the Base64 alphabet.
+     *
+     * @param octet
+     *            The value to test
+     * @return {@code true} if the value is defined in the the Base64 alphabet {@code false} otherwise.
+     */
+    @Override
+    protected boolean isInAlphabet(final byte octet) {
+        return octet >= 0 && octet < decodeTable.length && decodeTable[octet] != -1;
+    }
+
+}
diff --git a/java/client/src/org/apache/commons/codec/binary/BaseNCodec.java b/java/client/src/org/apache/commons/codec/binary/BaseNCodec.java
new file mode 100644
index 0000000..2edd754
--- /dev/null
+++ b/java/client/src/org/apache/commons/codec/binary/BaseNCodec.java
@@ -0,0 +1,500 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.codec.binary;
+
+import org.apache.commons.codec.BinaryDecoder;
+import org.apache.commons.codec.BinaryEncoder;
+import org.apache.commons.codec.DecoderException;
+import org.apache.commons.codec.EncoderException;
+
+/**
+ * Abstract superclass for Base-N encoders and decoders.
+ *
+ * <p>
+ * This class is thread-safe.
+ * </p>
+ *
+ * @version $Id$
+ */
+public abstract class BaseNCodec implements BinaryEncoder, BinaryDecoder {
+
+    /**
+     * Holds thread context so classes can be thread-safe.
+     *
+     * This class is not itself thread-safe; each thread must allocate its own copy.
+     *
+     * @since 1.7
+     */
+    static class Context {
+
+        /**
+         * Place holder for the bytes we're dealing with for our based logic.
+         * Bitwise operations store and extract the encoding or decoding from this variable.
+         */
+        int ibitWorkArea;
+
+        /**
+         * Place holder for the bytes we're dealing with for our based logic.
+         * Bitwise operations store and extract the encoding or decoding from this variable.
+         */
+        long lbitWorkArea;
+
+        /**
+         * Buffer for streaming.
+         */
+        byte[] buffer;
+
+        /**
+         * Position where next character should be written in the buffer.
+         */
+        int pos;
+
+        /**
+         * Position where next character should be read from the buffer.
+         */
+        int readPos;
+
+        /**
+         * Boolean flag to indicate the EOF has been reached. Once EOF has been reached, this object becomes useless,
+         * and must be thrown away.
+         */
+        boolean eof;
+
+        /**
+         * Variable tracks how many characters have been written to the current line. Only used when encoding. We use
+         * it to make sure each encoded line never goes beyond lineLength (if lineLength > 0).
+         */
+        int currentLinePos;
+
+        /**
+         * Writes to the buffer only occur after every 3/5 reads when encoding, and every 4/8 reads when decoding. This
+         * variable helps track that.
+         */
+        int modulus;
+
+        Context() {
+        }
+
+        /**
+         * Returns a String useful for debugging (especially within a debugger.)
+         *
+         * @return a String useful for debugging.
+         */
+        @SuppressWarnings("boxing") // OK to ignore boxing here
+        @Override
+        public String toString() {
+            return String.format("%s[buffer=%s, currentLinePos=%s, eof=%s, ibitWorkArea=%s, lbitWorkArea=%s, " +
+                    "modulus=%s, pos=%s, readPos=%s]", this.getClass().getSimpleName(), buffer, currentLinePos, eof,
+                    ibitWorkArea, lbitWorkArea, modulus, pos, readPos);
+        }
+    }
+
+    /**
+     * EOF
+     *
+     * @since 1.7
+     */
+    static final int EOF = -1;
+
+    /**
+     *  MIME chunk size per RFC 2045 section 6.8.
+     *
+     * <p>
+     * The {@value} character limit does not count the trailing CRLF, but counts all other characters, including any
+     * equal signs.
+     * </p>
+     *
+     * @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045 section 6.8</a>
+     */
+    public static final int MIME_CHUNK_SIZE = 76;
+
+    /**
+     * PEM chunk size per RFC 1421 section 4.3.2.4.
+     *
+     * <p>
+     * The {@value} character limit does not count the trailing CRLF, but counts all other characters, including any
+     * equal signs.
+     * </p>
+     *
+     * @see <a href="http://tools.ietf.org/html/rfc1421">RFC 1421 section 4.3.2.4</a>
+     */
+    public static final int PEM_CHUNK_SIZE = 64;
+
+    private static final int DEFAULT_BUFFER_RESIZE_FACTOR = 2;
+
+    /**
+     * Defines the default buffer size - currently {@value}
+     * - must be large enough for at least one encoded block+separator
+     */
+    private static final int DEFAULT_BUFFER_SIZE = 8192;
+
+    /** Mask used to extract 8 bits, used in decoding bytes */
+    protected static final int MASK_8BITS = 0xff;
+
+    /**
+     * Byte used to pad output.
+     */
+    protected static final byte PAD_DEFAULT = '='; // Allow static access to default
+
+    protected final byte PAD = PAD_DEFAULT; // instance variable just in case it needs to vary later
+
+    /** Number of bytes in each full block of unencoded data, e.g. 4 for Base64 and 5 for Base32 */
+    private final int unencodedBlockSize;
+
+    /** Number of bytes in each full block of encoded data, e.g. 3 for Base64 and 8 for Base32 */
+    private final int encodedBlockSize;
+
+    /**
+     * Chunksize for encoding. Not used when decoding.
+     * A value of zero or less implies no chunking of the encoded data.
+     * Rounded down to nearest multiple of encodedBlockSize.
+     */
+    protected final int lineLength;
+
+    /**
+     * Size of chunk separator. Not used unless {@link #lineLength} > 0.
+     */
+    private final int chunkSeparatorLength;
+
+    /**
+     * Note <code>lineLength</code> is rounded down to the nearest multiple of {@link #encodedBlockSize}
+     * If <code>chunkSeparatorLength</code> is zero, then chunking is disabled.
+     * @param unencodedBlockSize the size of an unencoded block (e.g. Base64 = 3)
+     * @param encodedBlockSize the size of an encoded block (e.g. Base64 = 4)
+     * @param lineLength if &gt; 0, use chunking with a length <code>lineLength</code>
+     * @param chunkSeparatorLength the chunk separator length, if relevant
+     */
+    protected BaseNCodec(final int unencodedBlockSize, final int encodedBlockSize,
+                         final int lineLength, final int chunkSeparatorLength) {
+        this.unencodedBlockSize = unencodedBlockSize;
+        this.encodedBlockSize = encodedBlockSize;
+        final boolean useChunking = lineLength > 0 && chunkSeparatorLength > 0;
+        this.lineLength = useChunking ? (lineLength / encodedBlockSize) * encodedBlockSize : 0;
+        this.chunkSeparatorLength = chunkSeparatorLength;
+    }
+
+    /**
+     * Returns true if this object has buffered data for reading.
+     *
+     * @param context the context to be used
+     * @return true if there is data still available for reading.
+     */
+    boolean hasData(final Context context) {  // package protected for access from I/O streams
+        return context.buffer != null;
+    }
+
+    /**
+     * Returns the amount of buffered data available for reading.
+     *
+     * @param context the context to be used
+     * @return The amount of buffered data available for reading.
+     */
+    int available(final Context context) {  // package protected for access from I/O streams
+        return context.buffer != null ? context.pos - context.readPos : 0;
+    }
+
+    /**
+     * Get the default buffer size. Can be overridden.
+     *
+     * @return {@link #DEFAULT_BUFFER_SIZE}
+     */
+    protected int getDefaultBufferSize() {
+        return DEFAULT_BUFFER_SIZE;
+    }
+
+    /**
+     * Increases our buffer by the {@link #DEFAULT_BUFFER_RESIZE_FACTOR}.
+     * @param context the context to be used
+     */
+    private byte[] resizeBuffer(final Context context) {
+        if (context.buffer == null) {
+            context.buffer = new byte[getDefaultBufferSize()];
+            context.pos = 0;
+            context.readPos = 0;
+        } else {
+            final byte[] b = new byte[context.buffer.length * DEFAULT_BUFFER_RESIZE_FACTOR];
+            System.arraycopy(context.buffer, 0, b, 0, context.buffer.length);
+            context.buffer = b;
+        }
+        return context.buffer;
+    }
+
+    /**
+     * Ensure that the buffer has room for <code>size</code> bytes
+     *
+     * @param size minimum spare space required
+     * @param context the context to be used
+     */
+    protected byte[] ensureBufferSize(final int size, final Context context){
+        if ((context.buffer == null) || (context.buffer.length < context.pos + size)){
+            return resizeBuffer(context);
+        }
+        return context.buffer;
+    }
+
+    /**
+     * Extracts buffered data into the provided byte[] array, starting at position bPos, up to a maximum of bAvail
+     * bytes. Returns how many bytes were actually extracted.
+     * <p>
+     * Package protected for access from I/O streams.
+     *
+     * @param b
+     *            byte[] array to extract the buffered data into.
+     * @param bPos
+     *            position in byte[] array to start extraction at.
+     * @param bAvail
+     *            amount of bytes we're allowed to extract. We may extract fewer (if fewer are available).
+     * @param context
+     *            the context to be used
+     * @return The number of bytes successfully extracted into the provided byte[] array.
+     */
+    int readResults(final byte[] b, final int bPos, final int bAvail, final Context context) {
+        if (context.buffer != null) {
+            final int len = Math.min(available(context), bAvail);
+            System.arraycopy(context.buffer, context.readPos, b, bPos, len);
+            context.readPos += len;
+            if (context.readPos >= context.pos) {
+                context.buffer = null; // so hasData() will return false, and this method can return -1
+            }
+            return len;
+        }
+        return context.eof ? EOF : 0;
+    }
+
+    /**
+     * Checks if a byte value is whitespace or not.
+     * Whitespace is taken to mean: space, tab, CR, LF
+     * @param byteToCheck
+     *            the byte to check
+     * @return true if byte is whitespace, false otherwise
+     */
+    protected static boolean isWhiteSpace(final byte byteToCheck) {
+        switch (byteToCheck) {
+            case ' ' :
+            case '\n' :
+            case '\r' :
+            case '\t' :
+                return true;
+            default :
+                return false;
+        }
+    }
+
+    /**
+     * Encodes an Object using the Base-N algorithm. This method is provided in order to satisfy the requirements of
+     * the Encoder interface, and will throw an EncoderException if the supplied object is not of type byte[].
+     *
+     * @param obj
+     *            Object to encode
+     * @return An object (of type byte[]) containing the Base-N encoded data which corresponds to the byte[] supplied.
+     * @throws EncoderException
+     *             if the parameter supplied is not of type byte[]
+     */
+    @Override
+    public Object encode(final Object obj) throws EncoderException {
+        if (!(obj instanceof byte[])) {
+            throw new EncoderException("Parameter supplied to Base-N encode is not a byte[]");
+        }
+        return encode((byte[]) obj);
+    }
+
+    /**
+     * Encodes a byte[] containing binary data, into a String containing characters in the Base-N alphabet.
+     * Uses UTF8 encoding.
+     *
+     * @param pArray
+     *            a byte array containing binary data
+     * @return A String containing only Base-N character data
+     */
+    public String encodeToString(final byte[] pArray) {
+        return StringUtils.newStringUtf8(encode(pArray));
+    }
+
+    /**
+     * Encodes a byte[] containing binary data, into a String containing characters in the appropriate alphabet.
+     * Uses UTF8 encoding.
+     *
+     * @param pArray a byte array containing binary data
+     * @return String containing only character data in the appropriate alphabet.
+    */
+    public String encodeAsString(final byte[] pArray){
+        return StringUtils.newStringUtf8(encode(pArray));
+    }
+
+    /**
+     * Decodes an Object using the Base-N algorithm. This method is provided in order to satisfy the requirements of
+     * the Decoder interface, and will throw a DecoderException if the supplied object is not of type byte[] or String.
+     *
+     * @param obj
+     *            Object to decode
+     * @return An object (of type byte[]) containing the binary data which corresponds to the byte[] or String
+     *         supplied.
+     * @throws DecoderException
+     *             if the parameter supplied is not of type byte[]
+     */
+    @Override
+    public Object decode(final Object obj) throws DecoderException {
+        if (obj instanceof byte[]) {
+            return decode((byte[]) obj);
+        } else if (obj instanceof String) {
+            return decode((String) obj);
+        } else {
+            throw new DecoderException("Parameter supplied to Base-N decode is not a byte[] or a String");
+        }
+    }
+
+    /**
+     * Decodes a String containing characters in the Base-N alphabet.
+     *
+     * @param pArray
+     *            A String containing Base-N character data
+     * @return a byte array containing binary data
+     */
+    public byte[] decode(final String pArray) {
+        return decode(StringUtils.getBytesUtf8(pArray));
+    }
+
+    /**
+     * Decodes a byte[] containing characters in the Base-N alphabet.
+     *
+     * @param pArray
+     *            A byte array containing Base-N character data
+     * @return a byte array containing binary data
+     */
+    @Override
+    public byte[] decode(final byte[] pArray) {
+        if (pArray == null || pArray.length == 0) {
+            return pArray;
+        }
+        final Context context = new Context();
+        decode(pArray, 0, pArray.length, context);
+        decode(pArray, 0, EOF, context); // Notify decoder of EOF.
+        final byte[] result = new byte[context.pos];
+        readResults(result, 0, result.length, context);
+        return result;
+    }
+
+    /**
+     * Encodes a byte[] containing binary data, into a byte[] containing characters in the alphabet.
+     *
+     * @param pArray
+     *            a byte array containing binary data
+     * @return A byte array containing only the basen alphabetic character data
+     */
+    @Override
+    public byte[] encode(final byte[] pArray) {
+        if (pArray == null || pArray.length == 0) {
+            return pArray;
+        }
+        final Context context = new Context();
+        encode(pArray, 0, pArray.length, context);
+        encode(pArray, 0, EOF, context); // Notify encoder of EOF.
+        final byte[] buf = new byte[context.pos - context.readPos];
+        readResults(buf, 0, buf.length, context);
+        return buf;
+    }
+
+    // package protected for access from I/O streams
+    abstract void encode(byte[] pArray, int i, int length, Context context);
+
+    // package protected for access from I/O streams
+    abstract void decode(byte[] pArray, int i, int length, Context context);
+
+    /**
+     * Returns whether or not the <code>octet</code> is in the current alphabet.
+     * Does not allow whitespace or pad.
+     *
+     * @param value The value to test
+     *
+     * @return {@code true} if the value is defined in the current alphabet, {@code false} otherwise.
+     */
+    protected abstract boolean isInAlphabet(byte value);
+
+    /**
+     * Tests a given byte array to see if it contains only valid characters within the alphabet.
+     * The method optionally treats whitespace and pad as valid.
+     *
+     * @param arrayOctet byte array to test
+     * @param allowWSPad if {@code true}, then whitespace and PAD are also allowed
+     *
+     * @return {@code true} if all bytes are valid characters in the alphabet or if the byte array is empty;
+     *         {@code false}, otherwise
+     */
+    public boolean isInAlphabet(final byte[] arrayOctet, final boolean allowWSPad) {
+        for (int i = 0; i < arrayOctet.length; i++) {
+            if (!isInAlphabet(arrayOctet[i]) &&
+                    (!allowWSPad || (arrayOctet[i] != PAD) && !isWhiteSpace(arrayOctet[i]))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Tests a given String to see if it contains only valid characters within the alphabet.
+     * The method treats whitespace and PAD as valid.
+     *
+     * @param basen String to test
+     * @return {@code true} if all characters in the String are valid characters in the alphabet or if
+     *         the String is empty; {@code false}, otherwise
+     * @see #isInAlphabet(byte[], boolean)
+     */
+    public boolean isInAlphabet(final String basen) {
+        return isInAlphabet(StringUtils.getBytesUtf8(basen), true);
+    }
+
+    /**
+     * Tests a given byte array to see if it contains any characters within the alphabet or PAD.
+     *
+     * Intended for use in checking line-ending arrays
+     *
+     * @param arrayOctet
+     *            byte array to test
+     * @return {@code true} if any byte is a valid character in the alphabet or PAD; {@code false} otherwise
+     */
+    protected boolean containsAlphabetOrPad(final byte[] arrayOctet) {
+        if (arrayOctet == null) {
+            return false;
+        }
+        for (final byte element : arrayOctet) {
+            if (PAD == element || isInAlphabet(element)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Calculates the amount of space needed to encode the supplied array.
+     *
+     * @param pArray byte[] array which will later be encoded
+     *
+     * @return amount of space needed to encoded the supplied array.
+     * Returns a long since a max-len array will require > Integer.MAX_VALUE
+     */
+    public long getEncodedLength(final byte[] pArray) {
+        // Calculate non-chunked size - rounded up to allow for padding
+        // cast to long is needed to avoid possibility of overflow
+        long len = ((pArray.length + unencodedBlockSize-1)  / unencodedBlockSize) * (long) encodedBlockSize;
+        if (lineLength > 0) { // We're using chunking
+            // Round up to nearest multiple
+            len += ((len + lineLength-1) / lineLength) * chunkSeparatorLength;
+        }
+        return len;
+    }
+}
diff --git a/java/client/src/org/apache/commons/codec/binary/StringUtils.java b/java/client/src/org/apache/commons/codec/binary/StringUtils.java
new file mode 100644
index 0000000..14a362f
--- /dev/null
+++ b/java/client/src/org/apache/commons/codec/binary/StringUtils.java
@@ -0,0 +1,343 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.codec.binary;
+
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
+
+import org.apache.commons.codec.CharEncoding;
+import org.apache.commons.codec.Charsets;
+
+/**
+ * Converts String to and from bytes using the encodings required by the Java specification. These encodings are
+ * specified in <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">
+ * Standard charsets</a>.
+ *
+ * <p>This class is immutable and thread-safe.</p>
+ *
+ * @see CharEncoding
+ * @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+ * @version $Id$
+ * @since 1.4
+ */
+public class StringUtils {
+
+    /**
+     * Calls {@link String#getBytes(Charset)}
+     *
+     * @param string
+     *            The string to encode (if null, return null).
+     * @param charset
+     *            The {@link Charset} to encode the {@code String}
+     * @return the encoded bytes
+     */
+    private static byte[] getBytes(final String string, final Charset charset) {
+        if (string == null) {
+            return null;
+        }
+        return string.getBytes(charset);
+    }
+
+    /**
+     * Encodes the given string into a sequence of bytes using the ISO-8859-1 charset, storing the result into a new
+     * byte array.
+     *
+     * @param string
+     *            the String to encode, may be {@code null}
+     * @return encoded bytes, or {@code null} if the input string was {@code null}
+     * @throws NullPointerException
+     *             Thrown if {@link Charsets#ISO_8859_1} is not initialized, which should never happen since it is
+     *             required by the Java platform specification.
+     * @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
+     * @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+     * @see #getBytesUnchecked(String, String)
+     */
+    public static byte[] getBytesIso8859_1(final String string) {
+        return getBytes(string, Charsets.ISO_8859_1);
+    }
+
+
+    /**
+     * Encodes the given string into a sequence of bytes using the named charset, storing the result into a new byte
+     * array.
+     * <p>
+     * This method catches {@link UnsupportedEncodingException} and rethrows it as {@link IllegalStateException}, which
+     * should never happen for a required charset name. Use this method when the encoding is required to be in the JRE.
+     * </p>
+     *
+     * @param string
+     *            the String to encode, may be {@code null}
+     * @param charsetName
+     *            The name of a required {@link java.nio.charset.Charset}
+     * @return encoded bytes, or {@code null} if the input string was {@code null}
+     * @throws IllegalStateException
+     *             Thrown when a {@link UnsupportedEncodingException} is caught, which should never happen for a
+     *             required charset name.
+     * @see CharEncoding
+     * @see String#getBytes(String)
+     */
+    public static byte[] getBytesUnchecked(final String string, final String charsetName) {
+        if (string == null) {
+            return null;
+        }
+        try {
+            return string.getBytes(charsetName);
+        } catch (final UnsupportedEncodingException e) {
+            throw StringUtils.newIllegalStateException(charsetName, e);
+        }
+    }
+
+    /**
+     * Encodes the given string into a sequence of bytes using the US-ASCII charset, storing the result into a new byte
+     * array.
+     *
+     * @param string
+     *            the String to encode, may be {@code null}
+     * @return encoded bytes, or {@code null} if the input string was {@code null}
+     * @throws NullPointerException
+     *             Thrown if {@link Charsets#US_ASCII} is not initialized, which should never happen since it is
+     *             required by the Java platform specification.
+     * @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
+     * @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+     * @see #getBytesUnchecked(String, String)
+     */
+    public static byte[] getBytesUsAscii(final String string) {
+        return getBytes(string, Charsets.US_ASCII);
+    }
+
+    /**
+     * Encodes the given string into a sequence of bytes using the UTF-16 charset, storing the result into a new byte
+     * array.
+     *
+     * @param string
+     *            the String to encode, may be {@code null}
+     * @return encoded bytes, or {@code null} if the input string was {@code null}
+     * @throws NullPointerException
+     *             Thrown if {@link Charsets#UTF_16} is not initialized, which should never happen since it is
+     *             required by the Java platform specification.
+     * @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
+     * @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+     * @see #getBytesUnchecked(String, String)
+     */
+    public static byte[] getBytesUtf16(final String string) {
+        return getBytes(string, Charsets.UTF_16);
+    }
+
+    /**
+     * Encodes the given string into a sequence of bytes using the UTF-16BE charset, storing the result into a new byte
+     * array.
+     *
+     * @param string
+     *            the String to encode, may be {@code null}
+     * @return encoded bytes, or {@code null} if the input string was {@code null}
+     * @throws NullPointerException
+     *             Thrown if {@link Charsets#UTF_16BE} is not initialized, which should never happen since it is
+     *             required by the Java platform specification.
+     * @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
+     * @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+     * @see #getBytesUnchecked(String, String)
+     */
+    public static byte[] getBytesUtf16Be(final String string) {
+        return getBytes(string, Charsets.UTF_16BE);
+    }
+
+    /**
+     * Encodes the given string into a sequence of bytes using the UTF-16LE charset, storing the result into a new byte
+     * array.
+     *
+     * @param string
+     *            the String to encode, may be {@code null}
+     * @return encoded bytes, or {@code null} if the input string was {@code null}
+     * @throws NullPointerException
+     *             Thrown if {@link Charsets#UTF_16LE} is not initialized, which should never happen since it is
+     *             required by the Java platform specification.
+     * @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
+     * @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+     * @see #getBytesUnchecked(String, String)
+     */
+    public static byte[] getBytesUtf16Le(final String string) {
+        return getBytes(string, Charsets.UTF_16LE);
+    }
+
+    /**
+     * Encodes the given string into a sequence of bytes using the UTF-8 charset, storing the result into a new byte
+     * array.
+     *
+     * @param string
+     *            the String to encode, may be {@code null}
+     * @return encoded bytes, or {@code null} if the input string was {@code null}
+     * @throws NullPointerException
+     *             Thrown if {@link Charsets#UTF_8} is not initialized, which should never happen since it is
+     *             required by the Java platform specification.
+     * @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
+     * @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
+     * @see #getBytesUnchecked(String, String)
+     */
+    public static byte[] getBytesUtf8(final String string) {
+        return getBytes(string, Charsets.UTF_8);
+    }
+
+    private static IllegalStateException newIllegalStateException(final String charsetName,
+                                                                  final UnsupportedEncodingException e) {
+        return new IllegalStateException(charsetName + ": " + e);
+    }
+
+    /**
+     * Constructs a new <code>String</code> by decoding the specified array of bytes using the given charset.
+     *
+     * @param bytes
+     *            The bytes to be decoded into characters
+     * @param charset
+     *            The {@link Charset} to encode the {@code String}
+     * @return A new <code>String</code> decoded from the specified array of bytes using the given charset,
+     *         or {@code null} if the input byte array was {@code null}.
+     * @throws NullPointerException
+     *             Thrown if {@link Charsets#UTF_8} is not initialized, which should never happen since it is
+     *             required by the Java platform specification.
+     */
+    private static String newString(final byte[] bytes, final Charset charset) {
+        return bytes == null ? null : new String(bytes, charset);
+    }
+
+    /**
+     * Constructs a new <code>String</code> by decoding the specified array of bytes using the given charset.
+     * <p>
+     * This method catches {@link UnsupportedEncodingException} and re-throws it as {@link IllegalStateException}, which
+     * should never happen for a required charset name. Use this method when the encoding is required to be in the JRE.
+     * </p>
+     *
+     * @param bytes
+     *            The bytes to be decoded into characters, may be {@code null}
+     * @param charsetName
+     *            The name of a required {@link java.nio.charset.Charset}
+     * @return A new <code>String</code> decoded from the specified array of bytes using the given charset,
+     *         or {@code null} if the input byte array was {@code null}.
+     * @throws IllegalStateException
+     *             Thrown when a {@link UnsupportedEncodingException} is caught, which should never happen for a
+     *             required charset name.
+     * @see CharEncoding
+     * @see String#String(byte[], String)
+     */
+    public static String newString(final byte[] bytes, final String charsetName) {
+        if (bytes == null) {
+            return null;
+        }
+        try {
+            return new String(bytes, charsetName);
+        } catch (final UnsupportedEncodingException e) {
+            throw StringUtils.newIllegalStateException(charsetName, e);
+        }
+    }
+
+    /**
+     * Constructs a new <code>String</code> by decoding the specified array of bytes using the ISO-8859-1 charset.
+     *
+     * @param bytes
+     *            The bytes to be decoded into characters, may be {@code null}
+     * @return A new <code>String</code> decoded from the specified array of bytes using the ISO-8859-1 charset, or
+     *         {@code null} if the input byte array was {@code null}.
+     * @throws NullPointerException
+     *             Thrown if {@link Charsets#ISO_8859_1} is not initialized, which should never happen since it is
+     *             required by the Java platform specification.
+     * @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
+     */
+    public static String newStringIso8859_1(final byte[] bytes) {
+        return new String(bytes, Charsets.ISO_8859_1);
+    }
+
+    /**
+     * Constructs a new <code>String</code> by decoding the specified array of bytes using the US-ASCII charset.
+     *
+     * @param bytes
+     *            The bytes to be decoded into characters
+     * @return A new <code>String</code> decoded from the specified array of bytes using the US-ASCII charset,
+     *         or {@code null} if the input byte array was {@code null}.
+     * @throws NullPointerException
+     *             Thrown if {@link Charsets#US_ASCII} is not initialized, which should never happen since it is
+     *             required by the Java platform specification.
+     * @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
+     */
+    public static String newStringUsAscii(final byte[] bytes) {
+        return new String(bytes, Charsets.US_ASCII);
+    }
+
+    /**
+     * Constructs a new <code>String</code> by decoding the specified array of bytes using the UTF-16 charset.
+     *
+     * @param bytes
+     *            The bytes to be decoded into characters
+     * @return A new <code>String</code> decoded from the specified array of bytes using the UTF-16 charset
+     *         or {@code null} if the input byte array was {@code null}.
+     * @throws NullPointerException
+     *             Thrown if {@link Charsets#UTF_16} is not initialized, which should never happen since it is
+     *             required by the Java platform specification.
+     * @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
+     */
+    public static String newStringUtf16(final byte[] bytes) {
+        return new String(bytes, Charsets.UTF_16);
+    }
+
+    /**
+     * Constructs a new <code>String</code> by decoding the specified array of bytes using the UTF-16BE charset.
+     *
+     * @param bytes
+     *            The bytes to be decoded into characters
+     * @return A new <code>String</code> decoded from the specified array of bytes using the UTF-16BE charset,
+     *         or {@code null} if the input byte array was {@code null}.
+     * @throws NullPointerException
+     *             Thrown if {@link Charsets#UTF_16BE} is not initialized, which should never happen since it is
+     *             required by the Java platform specification.
+     * @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
+     */
+    public static String newStringUtf16Be(final byte[] bytes) {
+        return new String(bytes, Charsets.UTF_16BE);
+    }
+
+    /**
+     * Constructs a new <code>String</code> by decoding the specified array of bytes using the UTF-16LE charset.
+     *
+     * @param bytes
+     *            The bytes to be decoded into characters
+     * @return A new <code>String</code> decoded from the specified array of bytes using the UTF-16LE charset,
+     *         or {@code null} if the input byte array was {@code null}.
+     * @throws NullPointerException
+     *             Thrown if {@link Charsets#UTF_16LE} is not initialized, which should never happen since it is
+     *             required by the Java platform specification.
+     * @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
+     */
+    public static String newStringUtf16Le(final byte[] bytes) {
+        return new String(bytes, Charsets.UTF_16LE);
+    }
+
+    /**
+     * Constructs a new <code>String</code> by decoding the specified array of bytes using the UTF-8 charset.
+     *
+     * @param bytes
+     *            The bytes to be decoded into characters
+     * @return A new <code>String</code> decoded from the specified array of bytes using the UTF-8 charset,
+     *         or {@code null} if the input byte array was {@code null}.
+     * @throws NullPointerException
+     *             Thrown if {@link Charsets#UTF_8} is not initialized, which should never happen since it is
+     *             required by the Java platform specification.
+     * @since As of 1.7, throws {@link NullPointerException} instead of UnsupportedEncodingException
+     */
+    public static String newStringUtf8(final byte[] bytes) {
+        return newString(bytes, Charsets.UTF_8);
+    }
+
+}
diff --git a/midori/config b/midori/config
new file mode 100644
index 0000000..95c33cb
--- /dev/null
+++ b/midori/config
@@ -0,0 +1,9 @@
+[settings]
+default-encoding=ISO-8859-1
+enable-site-specific-quirks=true
+last-window-width=800
+last-window-height=600
+show-menubar=false
+show-navigationbar=false
+enable-html5-database=true
+user-agent=Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-gb) AppleWebKit/535+ (KHTML, like Gecko) Version/5.0 Safari/535.22+ Midori/0.4
diff --git a/play.sh b/play.sh
new file mode 100755
index 0000000..5ec99ac
--- /dev/null
+++ b/play.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+# WebIOPi PiStore launch script
+
+# Force install
+#VERSION=`python -c "import webiopi; print(webiopi.VERSION)"`
+#if [ "$VERSION" != "0.5.3" ]; then
+#       echo "Update required..."
+#       chmod 777 setup.sh
+#       sudo ./setup.sh
+#fi
+
+# Start WebIOPi service
+sudo /etc/init.d/webiopi start
+
+# Launch the browser
+midori -c `pwd`/midori -a http://localhost:8000/
+
+# Stop WebIOPi service
+sudo /etc/init.d/webiopi stop
diff --git a/python/config b/python/config
new file mode 100644
index 0000000..77b99ec
--- /dev/null
+++ b/python/config
@@ -0,0 +1,136 @@
+[GPIO]
+# Initialize following GPIOs with given function and optional value
+# This is used during WebIOPi start process
+#21 = IN
+#23 = OUT 0
+#24 = OUT 0
+#25 = OUT 1
+
+#------------------------------------------------------------------------#
+
+[~GPIO]
+# Reset following GPIOs with given function and optional value
+# This is used at the end of WebIOPi stop process
+#21 = IN
+#23 = IN
+#24 = IN
+#25 = OUT 0
+
+#------------------------------------------------------------------------#
+
+[SCRIPTS]
+# Load custom scripts syntax :
+# name = sourcefile
+#   each sourcefile may have setup, loop and destroy functions and macros
+#myscript = /home/pi/webiopi/examples/scripts/macros/script.py
+
+#------------------------------------------------------------------------#
+
+[HTTP]
+# HTTP Server configuration
+enabled = true
+port = 8000
+
+# File containing sha256(base64("user:password"))
+# Use webiopi-passwd command to generate it
+passwd-file = /etc/webiopi/passwd
+
+# Use doc-root to change default HTML and resource files location
+#doc-root = /home/pi/webiopi/examples/scripts/macros
+
+# Use welcome-file to change the default "Welcome" file
+#welcome-file = index.html
+
+#------------------------------------------------------------------------#
+
+[COAP]
+# CoAP Server configuration
+enabled = true
+port = 5683
+# Enable CoAP multicast
+multicast = true
+
+#------------------------------------------------------------------------#
+
+[DEVICES]
+# Device configuration syntax:
+# name = device [args...]
+#   name   : used in the URL mapping
+#   device : device name
+#   args   : (optional) see device driver doc
+# If enabled, devices configured here are mapped on REST API /device/name
+# Devices are also accessible in custom scripts using deviceInstance(name)
+# See device driver doc for methods and URI scheme available
+
+# Raspberry native UART on GPIO, uncomment to enable
+# Don't forget to remove console on ttyAMA0 in /boot/cmdline.txt
+# And also disable getty on ttyAMA0 in /etc/inittab
+#serial0 = Serial device:ttyAMA0 baudrate:9600
+
+# USB serial adapters
+#usb0 = Serial device:ttyUSB0 baudrate:9600
+#usb1 = Serial device:ttyACM0 baudrate:9600
+
+#temp0 = TMP102
+#temp1 = TMP102 slave:0x49
+#temp2 = DS18B20
+#temp3 = DS18B20 slave:28-0000049bc218
+
+#bmp = BMP085
+
+#gpio0 = PCF8574
+#gpio1 = PCF8574 slave:0x21
+
+#light0 = TSL2561T
+#light1 = TSL2561T slave:0b0101001
+
+#gpio0 = MCP23017
+#gpio1 = MCP23017 slave:0x21
+#gpio2 = MCP23017 slave:0x22
+
+#pwm0 = PCA9685
+#pwm1 = PCA9685 slave:0x41
+
+#adc = MCP3008
+#dac = MCP4922 chip:1
+
+#------------------------------------------------------------------------#
+
+[REST]
+# By default, REST API allows to GET/POST on all GPIOs
+# Use gpio-export to limit GPIO available through REST API  
+#gpio-export = 21, 23, 24, 25
+
+# Uncomment to forbid changing GPIO values 
+#gpio-post-value = false
+
+# Uncomment to forbid changing GPIO functions 
+#gpio-post-function = false 
+
+# Uncomment to disable automatic device mapping
+#device-mapping = false
+
+#------------------------------------------------------------------------#
+
+[ROUTES]
+# Custom REST API route syntax :
+# source = destination
+#   source      : URL to route
+#   destination : Resulting URL
+# Adding routes allows to simplify access with Human comprehensive URLs
+
+# In the next example with have the bedroom light connected to GPIO 25
+# and a temperature sensor named temp2, defined in [DEVICES] section
+#  - GET  /bedroom/light       => GET  /GPIO/25/value, returns the light state
+#  - POST /bedroom/light/0     => POST /GPIO/25/value/0, turn off the light
+#  - POST /bedroom/light/1         => POST /GPIO/25/value/1, turn on the light
+#  - GET  /bedroom/temperature => GET  /devices/temp2/temperature/c, returns the temperature in celsius
+#/bedroom/light = /GPIO/25/value
+#/bedroom/temperature = /devices/temp2/temperature/c
+
+#/livingroom/light = /devices/expander0/0
+#/livingroom/brightness = /devices/adc/0/float
+#/livingroom/temperature = /devices/temp0/temperature/c
+
+#/weather/temperature = /devices/bmp/temperature/c
+#/weather/pressure = /devices/bmp/pressure/hpa
diff --git a/python/native/bridge.c b/python/native/bridge.c
new file mode 100644
index 0000000..8b2b8da
--- /dev/null
+++ b/python/native/bridge.c
@@ -0,0 +1,720 @@
+/*
+Copyright (c) 2012 Ben Croston / 2012-2013 Eric PTAK
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#include "Python.h"
+#include "gpio.h"
+#include "cpuinfo.h"
+
+static PyObject *_SetupException;
+static PyObject *_InvalidDirectionException;
+static PyObject *_InvalidChannelException;
+static PyObject *_InvalidPullException;
+
+static PyObject *_gpioCount;
+
+
+static PyObject *_low;
+static PyObject *_high;
+
+static PyObject *_in;
+static PyObject *_out;
+static PyObject *_alt0;
+static PyObject *_alt1;
+static PyObject *_alt2;
+static PyObject *_alt3;
+static PyObject *_alt4;
+static PyObject *_alt5;
+static PyObject *_pwm;
+
+static PyObject *_pud_off;
+static PyObject *_pud_up;
+static PyObject *_pud_down;
+
+static PyObject *_board_revision;
+
+static char* FUNCTIONS[] = {"IN", "OUT", "ALT5", "ALT4", "ALT0", "ALT1", "ALT2", "ALT3", "PWM"};
+static char* PWM_MODES[] = {"none", "ratio", "angle"};
+
+static int module_state = -1;
+
+// setup function run on import of the RPi.GPIO module
+static int module_setup(void)
+{
+        if (module_state == SETUP_OK) {
+                return SETUP_OK;
+        }
+
+        module_state = setup();
+        if (module_state == SETUP_DEVMEM_FAIL)
+        {
+                PyErr_SetString(_SetupException, "No access to /dev/mem.  Try running as root!");
+        } else if (module_state == SETUP_MALLOC_FAIL) {
+                PyErr_NoMemory();
+        } else if (module_state == SETUP_MMAP_FAIL) {
+                PyErr_SetString(_SetupException, "Mmap failed on module import");
+        }
+
+        return module_state;
+}
+
+// python function getFunction(channel)
+static PyObject *py_get_function(PyObject *self, PyObject *args)
+{
+        if (module_setup() != SETUP_OK) {
+                return NULL;
+        }
+
+        int channel, f;
+
+        if (!PyArg_ParseTuple(args, "i", &channel))
+                return NULL;
+
+        if (channel < 0 || channel >= GPIO_COUNT)
+        {
+                PyErr_SetString(_InvalidChannelException, "The GPIO channel is invalid");
+                return NULL;
+        }
+
+        f = get_function(channel);
+        return Py_BuildValue("i", f);
+}
+
+// python function getFunctionString(channel)
+static PyObject *py_get_function_string(PyObject *self, PyObject *args)
+{
+        if (module_setup() != SETUP_OK) {
+                return NULL;
+        }
+
+        int channel, f;
+        char *str;
+
+        if (!PyArg_ParseTuple(args, "i", &channel))
+                return NULL;
+
+        if (channel < 0 || channel >= GPIO_COUNT)
+        {
+                PyErr_SetString(_InvalidChannelException, "The GPIO channel is invalid");
+                return NULL;
+        }
+
+        f = get_function(channel);
+        str = FUNCTIONS[f];
+        return Py_BuildValue("s", str);
+}
+
+// python function setFunction(channel, direction, pull_up_down=PUD_OFF)
+static PyObject *py_set_function(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+        if (module_setup() != SETUP_OK) {
+                return NULL;
+        }
+
+        int channel, function;
+        int pud = PUD_OFF;
+        static char *kwlist[] = {"channel", "function", "pull_up_down", NULL};
+
+        if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ii|i", kwlist, &channel, &function, &pud))
+                return NULL;
+
+        if (function != IN && function != OUT && function != PWM)
+        {
+                PyErr_SetString(_InvalidDirectionException, "Invalid function");
+                return NULL;
+        }
+
+        if (function == OUT || function == PWM)
+        pud = PUD_OFF;
+
+        if (pud != PUD_OFF && pud != PUD_DOWN && pud != PUD_UP)
+        {
+                PyErr_SetString(_InvalidPullException, "Invalid value for pull_up_down - should be either PUD_OFF, PUD_UP or PUD_DOWN");
+                return NULL;
+        }
+
+        if (channel < 0 || channel >= GPIO_COUNT)
+        {
+                PyErr_SetString(_InvalidChannelException, "The GPIO channel is invalid");
+                return NULL;
+        }
+
+        set_function(channel, function, pud);
+
+        Py_INCREF(Py_None);
+        return Py_None;
+}
+
+// python function value = input(channel)
+static PyObject *py_input(PyObject *self, PyObject *args)
+{
+        if (module_setup() != SETUP_OK) {
+                return NULL;
+        }
+
+        int channel;
+
+        if (!PyArg_ParseTuple(args, "i", &channel))
+                return NULL;
+
+        if (channel < 0 || channel >= GPIO_COUNT)
+        {
+                PyErr_SetString(_InvalidChannelException, "The GPIO channel is invalid");
+                return NULL;
+        }
+
+        if (input(channel))
+                Py_RETURN_TRUE;
+        else
+                Py_RETURN_FALSE;
+}
+
+// python function output(channel, value)
+static PyObject *py_output(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+        if (module_setup() != SETUP_OK) {
+                return NULL;
+        }
+
+        int channel, value;
+        static char *kwlist[] = {"channel", "value", NULL};
+
+        if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ii", kwlist, &channel, &value))
+                return NULL;
+
+        if (channel < 0 || channel >= GPIO_COUNT)
+        {
+                PyErr_SetString(_InvalidChannelException, "The GPIO channel is invalid");
+                return NULL;
+        }
+
+        if (get_function(channel) != OUT)
+        {
+                PyErr_SetString(_InvalidDirectionException, "The GPIO channel is not an OUTPUT");
+                return NULL;
+        }
+
+        output(channel, value);
+
+        Py_INCREF(Py_None);
+        return Py_None;
+}
+
+// python function outputSequence(channel, period, sequence)
+static PyObject *py_output_sequence(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+        if (module_setup() != SETUP_OK) {
+                return NULL;
+        }
+
+        int channel, period;
+        char* sequence;
+        static char *kwlist[] = {"channel", "period", "sequence", NULL};
+
+        if (!PyArg_ParseTupleAndKeywords(args, kwargs, "iis", kwlist, &channel, &period, &sequence))
+                return NULL;
+
+        if (channel < 0 || channel >= GPIO_COUNT)
+        {
+                PyErr_SetString(_InvalidChannelException, "The GPIO channel is invalid");
+                return NULL;
+        }
+
+        if (get_function(channel) != OUT)
+        {
+                PyErr_SetString(_InvalidDirectionException, "The GPIO channel is not an OUTPUT");
+                return NULL;
+        }
+
+        outputSequence(channel, period, sequence);
+
+        Py_INCREF(Py_None);
+        return Py_None;
+}
+
+
+static PyObject *py_pulseMilli(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+        if (module_setup() != SETUP_OK) {
+                return NULL;
+        }
+
+        int channel, function, up, down;
+        static char *kwlist[] = {"channel", "up", "down", NULL};
+
+        if (!PyArg_ParseTupleAndKeywords(args, kwargs, "iii", kwlist, &channel, &up, &down))
+                return NULL;
+
+        if (channel < 0 || channel >= GPIO_COUNT)
+        {
+                PyErr_SetString(_InvalidChannelException, "The GPIO channel is invalid");
+                return NULL;
+        }
+
+        function = get_function(channel);
+        if ((function != OUT) && (function != PWM))
+        {
+                PyErr_SetString(_InvalidDirectionException, "The GPIO channel is not an OUTPUT or PWM");
+                return NULL;
+        }
+
+        pulseMilli(channel, up, down);
+
+        Py_INCREF(Py_None);
+        return Py_None;
+}
+
+
+static PyObject *py_pulseMilliRatio(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+        if (module_setup() != SETUP_OK) {
+                return NULL;
+        }
+
+        int channel, function, width;
+        float ratio;
+        static char *kwlist[] = {"channel", "width", "ratio", NULL};
+
+        if (!PyArg_ParseTupleAndKeywords(args, kwargs, "iif", kwlist, &channel, &width, &ratio))
+                return NULL;
+
+        if (channel < 0 || channel >= GPIO_COUNT)
+        {
+                PyErr_SetString(_InvalidChannelException, "The GPIO channel is invalid");
+                return NULL;
+        }
+
+        function = get_function(channel);
+        if ((function != OUT) && (function != PWM))
+        {
+                PyErr_SetString(_InvalidDirectionException, "The GPIO channel is not an OUTPUT or PWM");
+                return NULL;
+        }
+
+        pulseMilliRatio(channel, width, ratio);
+
+        Py_INCREF(Py_None);
+        return Py_None;
+}
+
+
+static PyObject *py_pulseMicro(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+        if (module_setup() != SETUP_OK) {
+                return NULL;
+        }
+
+        int channel, function, up, down;
+        static char *kwlist[] = {"channel", "up", "down", NULL};
+
+        if (!PyArg_ParseTupleAndKeywords(args, kwargs, "iii", kwlist, &channel, &up, &down))
+                return NULL;
+
+        if (channel < 0 || channel >= GPIO_COUNT)
+        {
+                PyErr_SetString(_InvalidChannelException, "The GPIO channel is invalid");
+                return NULL;
+        }
+
+        function = get_function(channel);
+        if ((function != OUT) && (function != PWM))
+        {
+                PyErr_SetString(_InvalidDirectionException, "The GPIO channel is not an OUTPUT or PWM");
+                return NULL;
+        }
+
+        pulseMicro(channel, up, down);
+
+        Py_INCREF(Py_None);
+        return Py_None;
+}
+
+static PyObject *py_pulseMicroRatio(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+        if (module_setup() != SETUP_OK) {
+                return NULL;
+        }
+
+        int channel, function, width;
+        float ratio;
+        static char *kwlist[] = {"channel", "width", "ratio", NULL};
+
+        if (!PyArg_ParseTupleAndKeywords(args, kwargs, "iif", kwlist, &channel, &width, &ratio))
+                return NULL;
+
+        if (channel < 0 || channel >= GPIO_COUNT)
+        {
+                PyErr_SetString(_InvalidChannelException, "The GPIO channel is invalid");
+                return NULL;
+        }
+
+        function = get_function(channel);
+        if ((function != OUT) && (function != PWM))
+        {
+                PyErr_SetString(_InvalidDirectionException, "The GPIO channel is not an OUTPUT or PWM");
+                return NULL;
+        }
+
+        pulseMicroRatio(channel, width, ratio);
+
+        Py_INCREF(Py_None);
+        return Py_None;
+}
+
+static PyObject *py_pulseAngle(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+        if (module_setup() != SETUP_OK) {
+                return NULL;
+        }
+
+        int channel, function;
+        float angle;
+        static char *kwlist[] = {"channel", "angle", NULL};
+
+        if (!PyArg_ParseTupleAndKeywords(args, kwargs, "if", kwlist, &channel, &angle))
+                return NULL;
+
+        if (channel < 0 || channel >= GPIO_COUNT)
+        {
+                PyErr_SetString(_InvalidChannelException, "The GPIO channel is invalid");
+                return NULL;
+        }
+
+        function = get_function(channel);
+        if ((function != OUT) && (function != PWM))
+        {
+                PyErr_SetString(_InvalidDirectionException, "The GPIO channel is not an OUTPUT or PWM");
+                return NULL;
+        }
+
+        pulseAngle(channel, angle);
+
+        Py_INCREF(Py_None);
+        return Py_None;
+}
+
+static PyObject *py_pulseRatio(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+        if (module_setup() != SETUP_OK) {
+                return NULL;
+        }
+
+        int channel, function;
+        float ratio;
+        static char *kwlist[] = {"channel", "ratio", NULL};
+
+        if (!PyArg_ParseTupleAndKeywords(args, kwargs, "if", kwlist, &channel, &ratio))
+                return NULL;
+
+        if (channel < 0 || channel >= GPIO_COUNT)
+        {
+                PyErr_SetString(_InvalidChannelException, "The GPIO channel is invalid");
+                return NULL;
+        }
+
+        function = get_function(channel);
+        if ((function != OUT) && (function != PWM))
+        {
+                PyErr_SetString(_InvalidDirectionException, "The GPIO channel is not an OUTPUT or PWM");
+                return NULL;
+        }
+
+        pulseRatio(channel, ratio);
+
+        Py_INCREF(Py_None);
+        return Py_None;
+}
+
+static PyObject *py_pulse(PyObject *self, PyObject *args)
+{
+        if (module_setup() != SETUP_OK) {
+                return NULL;
+        }
+
+        int channel;
+
+        if (!PyArg_ParseTuple(args, "i", &channel))
+                return NULL;
+
+        if (channel < 0 || channel >= GPIO_COUNT)
+        {
+                PyErr_SetString(_InvalidChannelException, "The GPIO channel is invalid");
+                return NULL;
+        }
+
+        pulseRatio(channel, 0.5);
+        return Py_None;
+}
+
+static PyObject *py_getPulse(PyObject *self, PyObject *args)
+{
+        if (module_setup() != SETUP_OK) {
+                return NULL;
+        }
+
+        int channel;
+        char str[256];
+        struct pulse *p;
+
+        if (!PyArg_ParseTuple(args, "i", &channel))
+                return NULL;
+
+        if (channel < 0 || channel >= GPIO_COUNT)
+        {
+                PyErr_SetString(_InvalidChannelException, "The GPIO channel is invalid");
+                return NULL;
+        }
+
+        p = getPulse(channel);
+
+        sprintf(str, "%s:%.2f", PWM_MODES[p->type], p->value);
+#if PY_MAJOR_VERSION > 2
+        return PyUnicode_FromString(str);
+#else
+        return PyString_FromString(str);
+#endif
+}
+
+static PyObject *py_enablePWM(PyObject *self, PyObject *args)
+{
+        if (module_setup() != SETUP_OK) {
+                return NULL;
+        }
+
+        int channel;
+
+        if (!PyArg_ParseTuple(args, "i", &channel))
+                return NULL;
+
+        if (channel < 0 || channel >= GPIO_COUNT)
+        {
+                PyErr_SetString(_InvalidChannelException, "The GPIO channel is invalid");
+                return NULL;
+        }
+
+        enablePWM(channel);
+        return Py_None;
+}
+
+static PyObject *py_disablePWM(PyObject *self, PyObject *args)
+{
+        if (module_setup() != SETUP_OK) {
+                return NULL;
+        }
+
+        int channel;
+
+        if (!PyArg_ParseTuple(args, "i", &channel))
+                return NULL;
+
+        if (channel < 0 || channel >= GPIO_COUNT)
+        {
+                PyErr_SetString(_InvalidChannelException, "The GPIO channel is invalid");
+                return NULL;
+        }
+
+        disablePWM(channel);
+        return Py_None;
+}
+
+
+
+static PyObject *py_isPWMEnabled(PyObject *self, PyObject *args)
+{
+        if (module_setup() != SETUP_OK) {
+                return NULL;
+        }
+
+        int channel;
+
+        if (!PyArg_ParseTuple(args, "i", &channel))
+                return NULL;
+
+        if (channel < 0 || channel >= GPIO_COUNT)
+        {
+                PyErr_SetString(_InvalidChannelException, "The GPIO channel is invalid");
+                return NULL;
+        }
+
+        if (isPWMEnabled(channel))
+                Py_RETURN_TRUE;
+        else
+                Py_RETURN_FALSE;
+}
+
+PyMethodDef python_methods[] = {
+        {"getFunction", py_get_function, METH_VARARGS, "Return the current GPIO setup (IN, OUT, ALT0)"},
+        {"getSetup", py_get_function, METH_VARARGS, "Return the current GPIO setup (IN, OUT, ALT0)"},
+
+        {"getFunctionString", py_get_function_string, METH_VARARGS, "Return the current GPIO setup (IN, OUT, ALT0) as string"},
+        {"getSetupString", py_get_function_string, METH_VARARGS, "Return the current GPIO setup (IN, OUT, ALT0) as string"},
+
+        {"setFunction", (PyCFunction)py_set_function, METH_VARARGS | METH_KEYWORDS, "Setup the GPIO channel, direction and (optional) pull/up down control\nchannel   - BCM GPIO number\ndirection - IN or OUT\n[pull_up_down] - PUD_OFF (default), PUD_UP or PUD_DOWN"},
+        {"setup", (PyCFunction)py_set_function, METH_VARARGS | METH_KEYWORDS, "Setup the GPIO channel, direction and (optional) pull/up down control\nchannel   - BCM GPIO number\ndirection - IN or OUT\n[pull_up_down] - PUD_OFF (default), PUD_UP or PUD_DOWN"},
+
+        {"input", py_input, METH_VARARGS, "Input from a GPIO channel - Deprecated, use digitalRead instead"},
+        {"digitalRead", py_input, METH_VARARGS, "Read a GPIO channel"},
+
+        {"output", (PyCFunction)py_output, METH_VARARGS | METH_KEYWORDS, "Output to a GPIO channel - Deprecated, use digitalWrite instead"},
+        {"digitalWrite", (PyCFunction)py_output, METH_VARARGS | METH_KEYWORDS, "Write to a GPIO channel"},
+
+        {"outputSequence", (PyCFunction)py_output_sequence, METH_VARARGS | METH_KEYWORDS, "Output a sequence to a GPIO channel"},
+
+        {"getPulse", py_getPulse, METH_VARARGS, "Read current PWM output"},
+        {"pwmRead", py_getPulse, METH_VARARGS, "Read current PWM output"},
+
+        {"pulseMilli", (PyCFunction)py_pulseMilli, METH_VARARGS | METH_KEYWORDS, "Output a PWM to a GPIO channel using milliseconds for both HIGH and LOW state widths"},
+        {"pulseMilliRatio", (PyCFunction)py_pulseMilliRatio, METH_VARARGS | METH_KEYWORDS, "Output a PWM to a GPIO channel using millisecond for the total width and a ratio (duty cycle) for the HIGH state width"},
+        {"pulseMicro", (PyCFunction)py_pulseMicro, METH_VARARGS | METH_KEYWORDS, "Output a PWM pulse to a GPIO channel using microseconds for both HIGH and LOW state widths"},
+        {"pulseMicroRatio", (PyCFunction)py_pulseMicroRatio, METH_VARARGS | METH_KEYWORDS, "Output a PWM to a GPIO channel using microseconds for the total width and a ratio (duty cycle) for the HIGH state width"},
+
+        {"pulseAngle", (PyCFunction)py_pulseAngle, METH_VARARGS | METH_KEYWORDS, "Output a PWM to a GPIO channel using an angle - Deprecated, use pwmWriteAngle instead"},
+        {"pwmWriteAngle", (PyCFunction)py_pulseAngle, METH_VARARGS | METH_KEYWORDS, "Output a PWM to a GPIO channel using an angle"},
+
+        {"pulseRatio", (PyCFunction)py_pulseRatio, METH_VARARGS | METH_KEYWORDS, "Output a PWM to a GPIO channel using a ratio (duty cycle) with the default 50Hz signal - Deprecated, use pwmWrite instead"},
+        {"pwmWrite", (PyCFunction)py_pulseRatio, METH_VARARGS | METH_KEYWORDS, "Output a PWM to a GPIO channel using a ratio (duty cycle) with the default 50Hz signal"},
+
+        {"pulse", py_pulse, METH_VARARGS, "Output a PWM to a GPIO channel using a 50% ratio (duty cycle) with the default 50Hz signal"},
+
+        {"enablePWM", py_enablePWM, METH_VARARGS, "Enable software PWM loop for a GPIO channel"},
+        {"disablePWM", py_disablePWM, METH_VARARGS, "Disable software PWM loop of a GPIO channel"},
+        {"isPWMEnabled", py_isPWMEnabled, METH_VARARGS, "Returns software PWM state"},
+
+        {NULL, NULL, 0, NULL}
+};
+
+#if PY_MAJOR_VERSION > 2
+static struct PyModuleDef python_module = {
+        PyModuleDef_HEAD_INIT,
+        "_webiopi.GPIO", /* name of module */
+        NULL,       /* module documentation, may be NULL */
+        -1,         /* size of per-interpreter state of the module,
+                                  or -1 if the module keeps state in global variables. */
+        python_methods
+};
+#endif
+
+#if PY_MAJOR_VERSION > 2
+PyMODINIT_FUNC PyInit_GPIO(void)
+#else
+PyMODINIT_FUNC initGPIO(void)
+#endif
+{
+        PyObject *module = NULL;
+        int revision = -1;
+
+#if PY_MAJOR_VERSION > 2
+        if ((module = PyModule_Create(&python_module)) == NULL)
+                goto exit;
+#else
+        if ((module = Py_InitModule("_webiopi.GPIO", python_methods)) == NULL)
+                goto exit;
+#endif
+
+        _SetupException = PyErr_NewException("_webiopi.GPIO.SetupException", NULL, NULL);
+        PyModule_AddObject(module, "SetupException", _SetupException);
+
+        _InvalidDirectionException = PyErr_NewException("_webiopi.GPIO.InvalidDirectionException", NULL, NULL);
+        PyModule_AddObject(module, "InvalidDirectionException", _InvalidDirectionException);
+
+        _InvalidChannelException = PyErr_NewException("_webiopi.GPIO.InvalidChannelException", NULL, NULL);
+        PyModule_AddObject(module, "InvalidChannelException", _InvalidChannelException);
+
+        _InvalidPullException = PyErr_NewException("_webiopi.GPIO.InvalidPullException", NULL, NULL);
+        PyModule_AddObject(module, "InvalidPullException", _InvalidPullException);
+
+        _gpioCount = Py_BuildValue("i", GPIO_COUNT);
+        PyModule_AddObject(module, "GPIO_COUNT", _gpioCount);
+
+        _low = Py_BuildValue("i", LOW);
+        PyModule_AddObject(module, "LOW", _low);
+
+        _high = Py_BuildValue("i", HIGH);
+        PyModule_AddObject(module, "HIGH", _high);
+
+        _in = Py_BuildValue("i", IN);
+        PyModule_AddObject(module, "IN", _in);
+
+        _out = Py_BuildValue("i", OUT);
+        PyModule_AddObject(module, "OUT", _out);
+
+        _alt0 = Py_BuildValue("i", ALT0);
+        PyModule_AddObject(module, "ALT0", _alt0);
+
+        _alt1 = Py_BuildValue("i", ALT1);
+        PyModule_AddObject(module, "ALT1", _alt1);
+
+        _alt2 = Py_BuildValue("i", ALT2);
+        PyModule_AddObject(module, "ALT2", _alt2);
+
+        _alt3 = Py_BuildValue("i", ALT3);
+        PyModule_AddObject(module, "ALT3", _alt3);
+
+        _alt4 = Py_BuildValue("i", ALT4);
+        PyModule_AddObject(module, "ALT4", _alt4);
+
+        _alt5 = Py_BuildValue("i", ALT5);
+        PyModule_AddObject(module, "ALT5", _alt5);
+
+        _pwm = Py_BuildValue("i", PWM);
+        PyModule_AddObject(module, "PWM", _pwm);
+
+        _pud_off = Py_BuildValue("i", PUD_OFF);
+        PyModule_AddObject(module, "PUD_OFF", _pud_off);
+
+        _pud_up = Py_BuildValue("i", PUD_UP);
+        PyModule_AddObject(module, "PUD_UP", _pud_up);
+
+        _pud_down = Py_BuildValue("i", PUD_DOWN);
+        PyModule_AddObject(module, "PUD_DOWN", _pud_down);
+
+        // detect board revision and set up accordingly
+        revision = get_rpi_revision();
+        if (revision == -1)
+        {
+                PyErr_SetString(_SetupException, "This module can only be run on a Raspberry Pi!");
+#if PY_MAJOR_VERSION > 2
+                return NULL;
+#else
+                return;
+#endif
+        }
+
+        _board_revision = Py_BuildValue("i", revision);
+        PyModule_AddObject(module, "BOARD_REVISION", _board_revision);
+
+        if (Py_AtExit(cleanup) != 0)
+        {
+                cleanup();
+#if PY_MAJOR_VERSION > 2
+                return NULL;
+#else
+                return;
+#endif
+        }
+
+exit:
+#if PY_MAJOR_VERSION > 2
+        return module;
+#else
+        return;
+#endif
+}
diff --git a/python/native/cpuinfo.c b/python/native/cpuinfo.c
new file mode 100644
index 0000000..a69d97e
--- /dev/null
+++ b/python/native/cpuinfo.c
@@ -0,0 +1,65 @@
+/*
+Copyright (c) 2012 Ben Croston
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include "cpuinfo.h"
+
+char *get_cpuinfo_revision(char *revision)
+{
+   FILE *fp;
+   char buffer[1024];
+   char hardware[1024];
+   int  rpi_found = 0;
+
+   if ((fp = fopen("/proc/cpuinfo", "r")) == NULL)
+      return 0;
+
+   while(!feof(fp)) {
+      fgets(buffer, sizeof(buffer) , fp);
+      sscanf(buffer, "Hardware  : %s", hardware);
+      if (strcmp(hardware, "BCM2708") == 0)
+         rpi_found = 1;
+      sscanf(buffer, "Revision  : %s", revision);
+   }
+   fclose(fp);
+
+   if (!rpi_found)
+      revision = NULL;
+   return revision;
+}
+
+int get_rpi_revision(void)
+{
+   char revision[1024] = {'\0'};
+   
+   if (get_cpuinfo_revision(revision) == NULL)
+      return -1;
+      
+   if ((strcmp(revision, "0002") == 0) ||
+       (strcmp(revision, "1000002") == 0 ) ||
+       (strcmp(revision, "0003") == 0) ||
+       (strcmp(revision, "1000003") == 0 ))
+      return 1;
+   else // assume rev 2 (0004 0005 0006 1000004 1000005 1000006)
+      return 2;
+}
diff --git a/python/native/cpuinfo.h b/python/native/cpuinfo.h
new file mode 100644
index 0000000..e84ea7d
--- /dev/null
+++ b/python/native/cpuinfo.h
@@ -0,0 +1,23 @@
+/*
+Copyright (c) 2012 Ben Croston
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+int get_rpi_revision(void);
diff --git a/python/native/gpio.c b/python/native/gpio.c
new file mode 100644
index 0000000..3950b16
--- /dev/null
+++ b/python/native/gpio.c
@@ -0,0 +1,329 @@
+/*
+Copyright (c) 2012 Ben Croston / 2012-2013 Eric PTAK
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <time.h>
+#include <pthread.h>
+#include "gpio.h"
+
+#define BCM2708_PERI_BASE   0x20000000
+#define GPIO_BASE           (BCM2708_PERI_BASE + 0x200000)
+#define FSEL_OFFSET         0   // 0x0000
+#define SET_OFFSET          7   // 0x001c / 4
+#define CLR_OFFSET          10  // 0x0028 / 4
+#define PINLEVEL_OFFSET     13  // 0x0034 / 4
+#define EVENT_DETECT_OFFSET 16  // 0x0040 / 4
+#define RISING_ED_OFFSET    19  // 0x004c / 4
+#define FALLING_ED_OFFSET   22  // 0x0058 / 4
+#define HIGH_DETECT_OFFSET  25  // 0x0064 / 4
+#define LOW_DETECT_OFFSET   28  // 0x0070 / 4
+#define PULLUPDN_OFFSET     37  // 0x0094 / 4
+#define PULLUPDNCLK_OFFSET  38  // 0x0098 / 4
+
+#define PAGE_SIZE  (4*1024)
+#define BLOCK_SIZE (4*1024)
+
+static volatile uint32_t *gpio_map;
+
+struct tspair {
+        struct timespec up;
+        struct timespec down;
+};
+
+static struct pulse gpio_pulses[GPIO_COUNT];
+static struct tspair gpio_tspairs[GPIO_COUNT];
+static pthread_t *gpio_threads[GPIO_COUNT];
+
+void short_wait(void)
+{
+    int i;
+    
+    for (i=0; i<150; i++)     // wait 150 cycles
+    {
+                asm volatile("nop");
+    }
+}
+
+int setup(void)
+{
+    int mem_fd;
+    uint8_t *gpio_mem;
+
+    if ((mem_fd = open("/dev/mem", O_RDWR|O_SYNC) ) < 0)
+    {
+        return SETUP_DEVMEM_FAIL;
+    }
+
+    if ((gpio_mem = malloc(BLOCK_SIZE + (PAGE_SIZE-1))) == NULL)
+        return SETUP_MALLOC_FAIL;
+
+    if ((uint32_t)gpio_mem % PAGE_SIZE)
+        gpio_mem += PAGE_SIZE - ((uint32_t)gpio_mem % PAGE_SIZE);
+
+    gpio_map = (uint32_t *)mmap( (caddr_t)gpio_mem, BLOCK_SIZE, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_FIXED, mem_fd, GPIO_BASE);
+
+    if ((uint32_t)gpio_map < 0)
+        return SETUP_MMAP_FAIL;
+
+    return SETUP_OK;
+}
+
+void set_pullupdn(int gpio, int pud)
+{
+    int clk_offset = PULLUPDNCLK_OFFSET + (gpio/32);
+    int shift = (gpio%32);
+    
+    if (pud == PUD_DOWN)
+       *(gpio_map+PULLUPDN_OFFSET) = (*(gpio_map+PULLUPDN_OFFSET) & ~3) | PUD_DOWN;
+    else if (pud == PUD_UP)
+       *(gpio_map+PULLUPDN_OFFSET) = (*(gpio_map+PULLUPDN_OFFSET) & ~3) | PUD_UP;
+    else  // pud == PUD_OFF
+       *(gpio_map+PULLUPDN_OFFSET) &= ~3;
+    
+    short_wait();
+    *(gpio_map+clk_offset) = 1 << shift;
+    short_wait();
+    *(gpio_map+PULLUPDN_OFFSET) &= ~3;
+    *(gpio_map+clk_offset) = 0;
+}
+
+//updated Eric PTAK - trouch.com
+void set_function(int gpio, int function, int pud)
+{
+        if (function == PWM) {
+                function = OUT;
+                enablePWM(gpio);
+        }
+        else {
+                disablePWM(gpio);
+        }
+
+    int offset = FSEL_OFFSET + (gpio/10);
+    int shift = (gpio%10)*3;
+
+    set_pullupdn(gpio, pud);
+        *(gpio_map+offset) = (*(gpio_map+offset) & ~(7<<shift)) | (function<<shift);
+}
+
+//added Eric PTAK - trouch.com
+int get_function(int gpio)
+{
+   int offset = FSEL_OFFSET + (gpio/10);
+   int shift = (gpio%10)*3;
+   int value = *(gpio_map+offset);
+   value >>= shift;
+   value &= 7;
+   if ((value == OUT) && isPWMEnabled(gpio)) {
+           value = PWM;
+   }
+   return value; // 0=input, 1=output, 4=alt0
+}
+
+//updated Eric PTAK - trouch.com
+int input(int gpio)
+{
+   int offset, value, mask;
+
+   offset = PINLEVEL_OFFSET + (gpio/32);
+   mask = (1 << gpio%32);
+   value = *(gpio_map+offset) & mask;
+   return value;
+}
+
+void output(int gpio, int value)
+{
+    int offset, shift;
+    
+    if (value) // value == HIGH
+        offset = SET_OFFSET + (gpio/32);
+    else       // value == LOW
+        offset = CLR_OFFSET + (gpio/32);
+    
+    shift = (gpio%32);
+
+    *(gpio_map+offset) = 1 << shift;
+}
+
+//added Eric PTAK - trouch.com
+void outputSequence(int gpio, int period, char* sequence) {
+        int i, value;
+        struct timespec ts;
+        ts.tv_sec = period/1000;
+        ts.tv_nsec = (period%1000) * 1000000;
+
+        for (i=0; sequence[i] != '\0'; i++) {
+                if (sequence[i] == '1') {
+                        value = 1;
+                }
+                else {
+                        value = 0;
+                }
+                output(gpio, value);
+            nanosleep(&ts, NULL);
+        }
+}
+
+void resetPWM(int gpio) {
+        gpio_pulses[gpio].type = 0;
+        gpio_pulses[gpio].value = 0;
+
+        gpio_tspairs[gpio].up.tv_sec = 0;
+        gpio_tspairs[gpio].up.tv_nsec = 0;
+        gpio_tspairs[gpio].down.tv_sec = 0;
+        gpio_tspairs[gpio].down.tv_nsec = 0;
+}
+
+//added Eric PTAK - trouch.com
+void pulseTS(int gpio, struct timespec *up, struct timespec *down) {
+        if ((up->tv_sec > 0) || (up->tv_nsec > 0)) {
+                output(gpio, 1);
+                nanosleep(up, NULL);
+        }
+
+        if ((down->tv_sec > 0) || (down->tv_nsec > 0)) {
+                output(gpio, 0);
+                nanosleep(down, NULL);
+        }
+}
+
+//added Eric PTAK - trouch.com
+void pulseOrSaveTS(int gpio, struct timespec *up, struct timespec *down) {
+        if (gpio_threads[gpio] != NULL) {
+                memcpy(&gpio_tspairs[gpio].up, up, sizeof(struct timespec));
+                memcpy(&gpio_tspairs[gpio].down, down, sizeof(struct timespec));
+        }
+        else {
+                pulseTS(gpio, up, down);
+        }
+}
+
+//added Eric PTAK - trouch.com
+void pulseMilli(int gpio, int up, int down) {
+        struct timespec tsUP, tsDOWN;
+
+        tsUP.tv_sec = up/1000;
+        tsUP.tv_nsec = (up%1000) * 1000000;
+
+        tsDOWN.tv_sec = down/1000;
+        tsDOWN.tv_nsec = (down%1000) * 1000000;
+        pulseOrSaveTS(gpio, &tsUP, &tsDOWN);
+}
+
+//added Eric PTAK - trouch.com
+void pulseMilliRatio(int gpio, int width, float ratio) {
+        int up = ratio*width;
+        int down = width - up;
+        pulseMilli(gpio, up, down);
+}
+
+//added Eric PTAK - trouch.com
+void pulseMicro(int gpio, int up, int down) {
+        struct timespec tsUP, tsDOWN;
+
+        tsUP.tv_sec = 0;
+        tsUP.tv_nsec = up * 1000;
+
+        tsDOWN.tv_sec = 0;
+        tsDOWN.tv_nsec = down * 1000;
+        pulseOrSaveTS(gpio, &tsUP, &tsDOWN);
+}
+
+//added Eric PTAK - trouch.com
+void pulseMicroRatio(int gpio, int width, float ratio) {
+        int up = ratio*width;
+        int down = width - up;
+        pulseMicro(gpio, up, down);
+}
+
+//added Eric PTAK - trouch.com
+void pulseAngle(int gpio, float angle) {
+        gpio_pulses[gpio].type = ANGLE;
+        gpio_pulses[gpio].value = angle;
+        int up = 1520 + (angle*400)/45;
+        int down = 20000-up;
+        pulseMicro(gpio, up, down);
+}
+
+//added Eric PTAK - trouch.com
+void pulseRatio(int gpio, float ratio) {
+        gpio_pulses[gpio].type = RATIO;
+        gpio_pulses[gpio].value = ratio;
+        int up = ratio * 20000;
+        int down = 20000 - up;
+        pulseMicro(gpio, up, down);
+}
+
+struct pulse* getPulse(int gpio) {
+        return &gpio_pulses[gpio];
+}
+
+//added Eric PTAK - trouch.com
+void* pwmLoop(void* data) {
+        int gpio = (int)data;
+
+        while (1) {
+                pulseTS(gpio, &gpio_tspairs[gpio].up, &gpio_tspairs[gpio].down);
+        }
+}
+
+//added Eric PTAK - trouch.com
+void enablePWM(int gpio) {
+        pthread_t *thread = gpio_threads[gpio];
+        if (thread != NULL) {
+                return;
+        }
+
+        resetPWM(gpio);
+
+        thread = (pthread_t*) malloc(sizeof(pthread_t));
+        pthread_create(thread, NULL, pwmLoop, (void*)gpio);
+        gpio_threads[gpio] = thread;
+}
+
+//added Eric PTAK - trouch.com
+void disablePWM(int gpio) {
+        pthread_t *thread = gpio_threads[gpio];
+        if (thread == NULL) {
+                return;
+        }
+
+        pthread_cancel(*thread);
+        gpio_threads[gpio] = NULL;
+        output(gpio, 0);
+        resetPWM(gpio);
+}
+
+//added Eric PTAK - trouch.com
+int isPWMEnabled(int gpio) {
+        return gpio_threads[gpio] != NULL;
+}
+
+
+void cleanup(void)
+{
+    // fixme - set all gpios back to input
+    munmap((caddr_t)gpio_map, BLOCK_SIZE);
+}
diff --git a/python/native/gpio.h b/python/native/gpio.h
new file mode 100644
index 0000000..cb0147c
--- /dev/null
+++ b/python/native/gpio.h
@@ -0,0 +1,73 @@
+/*
+Copyright (c) 2012 Ben Croston / 2012-2013 Eric PTAK
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#define SETUP_OK          0
+#define SETUP_DEVMEM_FAIL 1
+#define SETUP_MALLOC_FAIL 2
+#define SETUP_MMAP_FAIL   3
+
+#define GPIO_COUNT 54
+
+#define IN              0
+#define OUT             1
+#define ALT5    2
+#define ALT4    3
+#define ALT0    4
+#define ALT1    5
+#define ALT2    6
+#define ALT3    7
+#define PWM             8
+
+#define LOW             0
+#define HIGH    1
+
+#define PUD_OFF  0
+#define PUD_DOWN 1
+#define PUD_UP   2
+
+#define RATIO 1
+#define ANGLE 2
+
+struct pulse {
+        int type;
+        float value;
+};
+
+int setup(void);
+int get_function(int gpio);
+void set_function(int gpio, int function, int pud);
+int input(int gpio);
+void output(int gpio, int value);
+void outputSequence(int gpio, int period, char* sequence);
+struct pulse* getPulse(int gpio);
+void pulseMilli(int gpio, int up, int down);
+void pulseMilliRatio(int gpio, int width, float ratio);
+void pulseMicro(int gpio, int up, int down);
+void pulseMicroRatio(int gpio, int width, float ratio);
+void pulseAngle(int gpio, float angle);
+void pulseRatio(int gpio, float ratio);
+void enablePWM(int gpio);
+void disablePWM(int gpio);
+int isPWMEnabled(int gpio);
+
+void cleanup(void);
+
diff --git a/python/passwd b/python/passwd
new file mode 100644
index 0000000..4639dc4
--- /dev/null
+++ b/python/passwd
@@ -0,0 +1 @@
+a4f849b74f8d12e35fad61c06489b70676affd6ddc599fa3de47210e351b7875
\ No newline at end of file
diff --git a/python/setup.py b/python/setup.py
new file mode 100644
index 0000000..671cb27
--- /dev/null
+++ b/python/setup.py
@@ -0,0 +1,37 @@
+from setuptools import setup, Extension
+
+classifiers = ['Development Status :: 3 - Alpha',
+               'Operating System :: POSIX :: Linux',
+               'License :: OSI Approved :: MIT License',
+               'Intended Audience :: Developers',
+               'Programming Language :: Python :: 2.6',
+               'Programming Language :: Python :: 2.7',
+               'Programming Language :: Python :: 3',
+               'Topic :: Software Development',
+               'Topic :: Home Automation',
+               'Topic :: System :: Hardware']
+
+setup(name             = 'WebIOPi',
+      version          = '0.6.2',
+      author           = 'Eric PTAK',
+      author_email     = 'trouch@trouch.com',
+      description      = 'A package to control Raspberry Pi GPIO from the web',
+      long_description = open('../doc/README').read(),
+      license          = 'MIT',
+      keywords         = 'RaspberryPi GPIO Python REST',
+      url              = 'http://code.google.com/p/webiopi/',
+      classifiers      = classifiers,
+      packages         = ["webiopi",
+                          "webiopi.utils",
+                          "webiopi.clients",
+                          "webiopi.protocols",
+                          "webiopi.server",
+                          "webiopi.decorators",
+                          "webiopi.devices",
+                          "webiopi.devices.digital",
+                          "webiopi.devices.analog",
+                          "webiopi.devices.sensor",
+                          "webiopi.devices.shield"
+                          ],
+      ext_modules      = [Extension('_webiopi.GPIO', ['native/bridge.c', 'native/gpio.c', 'native/cpuinfo.c'])],
+      )
diff --git a/python/webiopi-passwd.py b/python/webiopi-passwd.py
new file mode 100755
index 0000000..7c0fbff
--- /dev/null
+++ b/python/webiopi-passwd.py
@@ -0,0 +1,57 @@
+#!/usr/bin/python
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+import sys
+file = None
+
+print("WebIOPi passwd file generator")
+if len(sys.argv)  == 2:
+    file = sys.argv[1]
+    if file == "--help" or file == "-h":
+        print("Usage: webiopi-passwd [--help|file]")
+        print("Compute and display hash used by WebIOPi for Authentication")
+        print("Login and Password are prompted")
+        print("\t--help\tDisplay this help")
+        print("\t-h")
+        print("\tfile\tSave hash to file")
+        sys.exit()
+else:
+    file = "/etc/webiopi/passwd"       
+
+f = open(file, "w")
+_LOGIN      = "Enter Login: "
+_PASSWORD   = "Enter Password: "
+_CONFIRM    = "Confirm password: "
+_DONTMATCH  = "Passwords don't match !"
+
+import getpass
+try:
+    login = raw_input(_LOGIN)
+except NameError:
+    login = input(_LOGIN)
+password = getpass.getpass(_PASSWORD)
+password2 = getpass.getpass(_CONFIRM)
+while password != password2:
+    print(_DONTMATCH)
+    password = getpass.getpass(_PASSWORD)
+    password2 = getpass.getpass(_CONFIRM)
+
+from webiopi.utils.crypto import encryptCredentials
+auth = encryptCredentials(login, password)
+print("\nHash: %s" % auth)
+if file:
+    f.write(auth)
+    f.close()
+    print("Saved to %s" % file)
diff --git a/python/webiopi.init.sh b/python/webiopi.init.sh
new file mode 100755
index 0000000..29457f5
--- /dev/null
+++ b/python/webiopi.init.sh
@@ -0,0 +1,155 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          webiopi
+# Required-Start:    $remote_fs $syslog $network
+# Required-Stop:     $remote_fs $syslog $network
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: WebIOPi initscript
+# Description:       WebIOPi initscript
+### END INIT INFO
+
+# Author: trouch <trouch@trouch.com>
+LOG_FILE=/var/log/webiopi
+CONFIG_FILE=/etc/webiopi/config
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="WebIOPi"
+NAME=webiopi
+HOME=/usr/share/webiopi/htdocs
+DAEMON=/usr/bin/python
+DAEMON_ARGS="-m webiopi -l $LOG_FILE -c $CONFIG_FILE"
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
+# and status_of_proc is working.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+        # Return
+        #   0 if daemon has been started
+        #   1 if daemon was already running
+        #   2 if daemon could not be started
+        start-stop-daemon --start --quiet --chdir $HOME --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+                || return 1
+        start-stop-daemon --start --quiet --chdir $HOME --pidfile $PIDFILE --exec $DAEMON --background --make-pidfile -- \
+                $DAEMON_ARGS \
+                || return 2
+        # Add code here, if necessary, that waits for the process to be ready
+        # to handle requests from services started subsequently which depend
+        # on this one.  As a last resort, sleep for some time.
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+        # Return
+        #   0 if daemon has been stopped
+        #   1 if daemon was already stopped
+        #   2 if daemon could not be stopped
+        #   other if a failure occurred
+        start-stop-daemon --stop --quiet --pidfile $PIDFILE --name $NAME
+        RETVAL="$?"
+        [ "$RETVAL" = 2 ] && return 2
+        # Wait for children to finish too if this is a daemon that forks
+        # and if the daemon is only ever run from this initscript.
+        # If the above conditions are not satisfied then add some other code
+        # that waits for the process to drop all resources that could be
+        # needed by services started subsequently.  A last resort is to
+        # sleep for some time.
+        start-stop-daemon --stop --quiet --exec $DAEMON
+        [ "$?" = 2 ] && return 2
+        # Many daemons don't delete their pidfiles when they exit.
+        rm -f $PIDFILE
+        return "$RETVAL"
+}
+
+#
+# Function that sends a SIGHUP to the daemon/service
+#
+do_reload() {
+        #
+        # If the daemon can reload its configuration without
+        # restarting (for example, when it is sent a SIGHUP),
+        # then implement that here.
+        #
+        start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
+        return 0
+}
+
+case "$1" in
+  start)
+        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+        do_start
+        case "$?" in
+                0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+                2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+        esac
+        ;;
+  stop)
+        [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+        do_stop
+        case "$?" in
+                0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+                2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+        esac
+        ;;
+  status)
+        status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+        ;;
+  #reload|force-reload)
+        #
+        # If do_reload() is not implemented then leave this commented out
+        # and leave 'force-reload' as an alias for 'restart'.
+        #
+        #log_daemon_msg "Reloading $DESC" "$NAME"
+        #do_reload
+        #log_end_msg $?
+        #;;
+  restart|force-reload)
+        #
+        # If the "reload" option is implemented then remove the
+        # 'force-reload' alias
+        #
+        log_daemon_msg "Restarting $DESC" "$NAME"
+        do_stop
+        case "$?" in
+          0|1)
+                do_start
+                case "$?" in
+                        0) log_end_msg 0 ;;
+                        1) log_end_msg 1 ;; # Old process is still running
+                        *) log_end_msg 1 ;; # Failed to start
+                esac
+                ;;
+          *)
+                # Failed to stop
+                log_end_msg 1
+                ;;
+        esac
+        ;;
+  *)
+        #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
+        echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+        exit 3
+        ;;
+esac
+
+:
diff --git a/python/webiopi.sh b/python/webiopi.sh
new file mode 100755
index 0000000..0cf7bb5
--- /dev/null
+++ b/python/webiopi.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+python -m webiopi $*
diff --git a/python/webiopi/__init__.py b/python/webiopi/__init__.py
new file mode 100644
index 0000000..c0f811e
--- /dev/null
+++ b/python/webiopi/__init__.py
@@ -0,0 +1,34 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+
+from time import sleep
+ 
+from webiopi.utils.version import BOARD_REVISION, VERSION
+from webiopi.utils.logger import setInfo, setDebug, info, debug, warn, error, exception
+from webiopi.utils.thread import runLoop
+from webiopi.server import Server
+from webiopi.devices.instance import deviceInstance
+from webiopi.decorators.rest import macro
+
+from webiopi.devices import bus as _bus
+
+try:
+    import _webiopi.GPIO as GPIO
+except:
+    pass
+
+
+setInfo()
+_bus.checkAllBus()
diff --git a/python/webiopi/__main__.py b/python/webiopi/__main__.py
new file mode 100644
index 0000000..dc57bc2
--- /dev/null
+++ b/python/webiopi/__main__.py
@@ -0,0 +1,79 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+import sys
+from webiopi.server import Server
+from webiopi.utils.loader import loadScript
+from webiopi.utils.logger import exception, setDebug, info, logToFile
+from webiopi.utils.version import VERSION_STRING
+from webiopi.utils.thread import runLoop, stop
+
+def displayHelp():
+    print("WebIOPi command-line usage")
+    print("webiopi [-h] [-c config] [-l log] [-s script] [-d] [port]")
+    print("")
+    print("Options:")
+    print("  -h, --help           Display this help")
+    print("  -c, --config file    Load config from file")
+    print("  -l, --log file       Log to file")
+    print("  -s, --script file    Load script from file")
+    print("  -d, --debug          Enable DEBUG")
+    print("")
+    print("Arguments:")
+    print("  port                 Port to bind the HTTP Server")
+    exit()
+
+def main(argv):
+    port = 8000
+    configfile = None
+    logfile = None
+    
+    i = 1
+    while i < len(argv):
+        if argv[i] in ["-c", "-C", "--config-file"]:
+            configfile = argv[i+1]
+            i+=1
+        elif argv[i] in ["-l", "-L", "--log-file"]:
+            logfile = argv[i+1]
+            i+=1
+        elif argv[i] in ["-s", "-S", "--script-file"]:
+            scriptfile = argv[i+1]
+            scriptname = scriptfile.split("/")[-1].split(".")[0]
+            loadScript(scriptname, scriptfile)
+            i+=1
+        elif argv[i] in ["-h", "-H", "--help"]:
+            displayHelp()
+        elif argv[i] in ["-d", "--debug"]:
+            setDebug()
+        else:
+            try:
+                port = int(argv[i])
+            except ValueError:
+                displayHelp()
+        i+=1
+    
+    if logfile:
+        logToFile(logfile)
+
+    info("Starting %s" % VERSION_STRING)
+    server = Server(port=port, configfile=configfile)
+    runLoop()
+    server.stop()
+
+if __name__ == "__main__":
+    try:
+        main(sys.argv)
+    except Exception as e:
+        exception(e)
+        stop()
diff --git a/python/webiopi/clients/__init__.py b/python/webiopi/clients/__init__.py
new file mode 100644
index 0000000..d8527af
--- /dev/null
+++ b/python/webiopi/clients/__init__.py
@@ -0,0 +1,209 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from webiopi.utils.logger import LOGGER
+from webiopi.utils.version import PYTHON_MAJOR
+from webiopi.utils.crypto import encodeCredentials
+from webiopi.protocols.coap import COAPClient, COAPGet, COAPPost, COAPPut, COAPDelete
+
+if PYTHON_MAJOR >= 3:
+    import http.client as httplib
+else:
+    import httplib
+
+class PiMixedClient():
+    def __init__(self, host, port=8000, coap=5683):
+        self.host = host
+        if coap > 0:
+            self.coapport = coap
+            self.coapclient = COAPClient()
+        else:
+            self.coapclient = None
+        if port > 0:
+            self.httpclient = httplib.HTTPConnection(host, port)
+        else:
+            self.httpclient = None
+        self.forceHttp = False
+        self.coapfailure = 0
+        self.maxfailure = 2
+        self.auth= None;
+    
+    def setCredentials(self, login, password):
+        self.auth = "Basic " + encodeCredentials(login, password)
+        
+    def sendRequest(self, method, uri):
+        if self.coapclient != None and not self.forceHttp:
+            if method == "GET":
+                response = self.coapclient.sendRequest(COAPGet("coap://%s:%d%s" % (self.host, self.coapport, uri)))
+            elif method == "POST":
+                response = self.coapclient.sendRequest(COAPPost("coap://%s:%d%s" % (self.host, self.coapport, uri)))
+
+            if response:
+                return str(response.payload)
+            elif self.httpclient != None:
+                self.coapfailure += 1
+                print("No CoAP response, fall-back to HTTP")
+                if (self.coapfailure > self.maxfailure):
+                    self.forceHttp = True
+                    self.coapfailure = 0
+                    print("Too many CoAP failure forcing HTTP")
+        
+        if self.httpclient != None:
+            headers = {}
+            if self.auth != None:
+                headers["Authorization"] = self.auth
+            
+            self.httpclient.request(method, uri, None, headers)
+            response = self.httpclient.getresponse()
+            if response.status == 200:
+                data = response.read()
+                return data
+            elif response.status == 401:
+                raise Exception("Missing credentials")
+            else:
+                raise Exception("Unhandled HTTP Response %d %s" % (response.status, response.reason))
+
+        raise Exception("No data received")
+
+class PiHttpClient(PiMixedClient):
+    def __init__(self, host, port=8000):
+        PiMixedClient.__init__(self, host, port, -1)
+
+class PiCoapClient(PiMixedClient):
+    def __init__(self, host, port=5683):
+        PiMixedClient.__init__(self, host, -1, port)
+
+class PiMulticastClient(PiMixedClient):
+    def __init__(self, port=5683):
+        PiMixedClient.__init__(self, "224.0.1.123", -1, port)
+
+class RESTAPI():
+    def __init__(self, client, path):
+        self.client = client
+        self.path = path
+        
+    def sendRequest(self, method, path):
+        return self.client.sendRequest(method, self.path + path)
+        
+class Macro(RESTAPI):
+    def __init__(self, client, name):
+        RESTAPI.__init__(self, client, "/macros/" + name + "/")
+        
+    def call(self, *args):
+        values = ",".join(["%s" % i for i in args])
+        if values == None:
+            values = ""
+        return self.sendRequest("POST", values)
+
+class Device(RESTAPI):
+    def __init__(self, client, name, category):
+        RESTAPI.__init__(self, client, "/devices/" + name + "/" + category)
+
+class GPIO(Device):
+    def __init__(self, client, name):
+        Device.__init__(self, client, name, "digital")
+        
+    def getFunction(self, channel):
+        return self.sendRequest("GET", "/%d/function" % channel)
+
+    def setFunction(self, channel, func):
+        return self.sendRequest("POST", "/%d/function/%s" % (channel, func))
+        
+    def digitalRead(self, channel):
+        return int(self.sendRequest("GET", "/%d/value" % channel))
+
+    def digitalWrite(self, channel, value):
+        return int(self.sendRequest("POST", "/%d/value/%d" % (channel, value)))
+    
+    def portRead(self):
+        return int(self.sendRequest("GET", "/integer"))
+
+    def portWrite(self, value):
+        return int(self.sendRequest("POST", "/integer/%d" % value))
+
+class NativeGPIO(GPIO):
+    def __init__(self, client):
+        RESTAPI.__init__(self, client, "/GPIO")
+
+class ADC(Device):
+    def __init__(self, client, name):
+        Device.__init__(self, client, name, "analog")
+        
+    def read(self, channel):
+        return float(self.sendRequest("GET", "/%d/integer" % channel))
+
+    def readFloat(self, channel):
+        return float(self.sendRequest("GET", "/%d/float" % channel))
+
+    def readVolt(self, channel):
+        return float(self.sendRequest("GET", "/%d/volt" % channel))
+
+class DAC(ADC):
+    def __init__(self, client, name):
+        Device.__init__(self, client, name, "analog")
+        
+    def write(self, channel, value):
+        return float(self.sendRequest("POST", "/%d/integer/%d" % (channel, value)))
+                     
+    def writeFloat(self, channel, value):
+        return float(self.sendRequest("POST", "/%d/float/%f" % (channel, value)))
+                     
+    def writeVolt(self, channel, value):
+        return float(self.sendRequest("POST", "/%d/volt/%f" % (channel, value)))
+                     
+class PWM(DAC):
+    def __init__(self, client, name):
+        Device.__init__(self, client, name, "pwm")
+        
+    def readAngle(self, channel, value):
+        return float(self.sendRequest("GET", "/%d/angle" % (channel)))
+                     
+    def writeAngle(self, channel, value):
+        return float(self.sendRequest("POST", "/%d/angle/%f" % (channel, value)))
+                     
+class Sensor(Device):
+    def __init__(self, client, name):
+        Device.__init__(self, client, name, "sensor")
+        
+class Temperature(Sensor):
+    def getKelvin(self):
+        return float(self.sendRequest("GET", "/temperature/k"))
+
+    def getCelsius(self):
+        return float(self.sendRequest("GET", "/temperature/c"))
+
+    def getFahrenheit(self):
+        return float(self.sendRequest("GET", "/temperature/f"))
+    
+class Pressure(Sensor):
+    def getPascal(self):
+        return float(self.sendRequest("GET", "/pressure/pa"))
+
+    def getHectoPascal(self):
+        return float(self.sendRequest("GET", "/pressure/hpa"))
+    
+class Luminosity(Sensor):
+    def getLux(self):
+        return float(self.sendRequest("GET", "/luminosity/lux"))
+    
+class Distance(Sensor):
+    def getMillimeter(self):
+        return float(self.sendRequest("GET", "/distance/mm"))
+
+    def getCentimeter(self):
+        return float(self.sendRequest("GET", "/distance/cm"))
+
+    def getInch(self):
+        return float(self.sendRequest("GET", "/distance/in"))
+
diff --git a/python/webiopi/decorators/__init__.py b/python/webiopi/decorators/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/python/webiopi/decorators/__init__.py
diff --git a/python/webiopi/decorators/rest.py b/python/webiopi/decorators/rest.py
new file mode 100644
index 0000000..7fffacc
--- /dev/null
+++ b/python/webiopi/decorators/rest.py
@@ -0,0 +1,19 @@
+def request(method="GET", path="", data=None):
+    def wrapper(func):
+        func.routed = True
+        func.method = method
+        func.path = path
+        func.data = data
+        return func
+    return wrapper
+
+def response(fmt="%s", contentType="text/plain"):
+    def wrapper(func):
+        func.format = fmt
+        func.contentType = contentType
+        return func
+    return wrapper
+
+def macro(func):
+    func.macro = True
+    return func
diff --git a/python/webiopi/devices/__init__.py b/python/webiopi/devices/__init__.py
new file mode 100644
index 0000000..ecd45ec
--- /dev/null
+++ b/python/webiopi/devices/__init__.py
@@ -0,0 +1,13 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
diff --git a/python/webiopi/devices/analog/__init__.py b/python/webiopi/devices/analog/__init__.py
new file mode 100644
index 0000000..4c94b9c
--- /dev/null
+++ b/python/webiopi/devices/analog/__init__.py
@@ -0,0 +1,267 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from webiopi.decorators.rest import request, response
+from webiopi.utils.types import M_JSON
+
+class ADC():
+    def __init__(self, channelCount, resolution, vref):
+        self._analogCount = channelCount
+        self._analogResolution = resolution
+        self._analogMax = 2**resolution - 1
+        self._analogRef = vref
+    
+    def __family__(self):
+        return "ADC"
+
+    def checkAnalogChannel(self, channel):
+        if not 0 <= channel < self._analogCount:
+            raise ValueError("Channel %d out of range [%d..%d]" % (channel, 0, self._analogCount-1))
+
+    def checkAnalogValue(self, value):
+        if not 0 <= value <= self._analogMax:
+            raise ValueError("Value %d out of range [%d..%d]" % (value, 0, self._analogMax))
+    
+    @request("GET", "analog/count")
+    @response("%d")
+    def analogCount(self):
+        return self._analogCount
+
+    @request("GET", "analog/resolution")
+    @response("%d")
+    def analogResolution(self):
+        return self._analogResolution
+    
+    @request("GET", "analog/max")
+    @response("%d")
+    def analogMaximum(self):
+        return int(self._analogMax)
+    
+    @request("GET", "analog/vref")
+    @response("%.2f")
+    def analogReference(self):
+        return self._analogRef
+    
+    def __analogRead__(self, channel, diff):
+        raise NotImplementedError
+    
+    @request("GET", "analog/%(channel)d/integer")
+    @response("%d")
+    def analogRead(self, channel, diff=False):
+        self.checkAnalogChannel(channel)
+        return self.__analogRead__(channel, diff)
+    
+    @request("GET", "analog/%(channel)d/float")
+    @response("%.2f")
+    def analogReadFloat(self, channel, diff=False):
+        return self.analogRead(channel, diff) / float(self._analogMax)
+    
+    @request("GET", "analog/%(channel)d/volt")
+    @response("%.2f")
+    def analogReadVolt(self, channel, diff=False):
+        if self._analogRef == 0:
+            raise NotImplementedError
+        return self.analogReadFloat(channel, diff) * self._analogRef
+    
+    @request("GET", "analog/*/integer")
+    @response(contentType=M_JSON)
+    def analogReadAll(self):
+        values = {}
+        for i in range(self._analogCount):
+            values[i] = self.analogRead(i)
+        return values
+            
+    @request("GET", "analog/*/float")
+    @response(contentType=M_JSON)
+    def analogReadAllFloat(self):
+        values = {}
+        for i in range(self._analogCount):
+            values[i] = float("%.2f" % self.analogReadFloat(i))
+        return values
+    
+    @request("GET", "analog/*/volt")
+    @response(contentType=M_JSON)
+    def analogReadAllVolt(self):
+        values = {}
+        for i in range(self._analogCount):
+            values[i] = float("%.2f" % self.analogReadVolt(i))
+        return values
+    
+class DAC(ADC):
+    def __init__(self, channelCount, resolution, vref):
+        ADC.__init__(self, channelCount, resolution, vref)
+    
+    def __family__(self):
+        return "DAC"
+    
+    def __analogWrite__(self, channel, value):
+        raise NotImplementedError
+    
+    @request("POST", "analog/%(channel)d/integer/%(value)d")
+    @response("%d")    
+    def analogWrite(self, channel, value):
+        self.checkAnalogChannel(channel)
+        self.checkAnalogValue(value)
+        self.__analogWrite__(channel, value)
+        return self.analogRead(channel)
+    
+    @request("POST", "analog/%(channel)d/float/%(value)f")        
+    @response("%.2f")    
+    def analogWriteFloat(self, channel, value):
+        self.analogWrite(channel, int(value * self._analogMax))
+        return self.analogReadFloat(channel)
+    
+    @request("POST", "analog/%(channel)d/volt/%(value)f")        
+    @response("%.2f")    
+    def analogWriteVolt(self, channel, value):
+        self.analogWriteFloat(channel, value /self._analogRef)
+        return self.analogReadVolt(channel)
+    
+
+class PWM():
+    def __init__(self, channelCount, resolution, frequency):
+        self._pwmCount = channelCount
+        self._pwmResolution = resolution
+        self._pwmMax = 2**resolution - 1
+        self.frequency = frequency
+        self.period = 1.0/frequency
+        
+        # Futaba servos standard
+        self.servo_neutral = 0.00152
+        self.servo_travel_time = 0.0004
+        self.servo_travel_angle = 45.0
+        
+        self.reverse = [False for i in range(channelCount)]
+         
+    def __family__(self):
+        return "PWM"
+
+    def checkPWMChannel(self, channel):
+        if not 0 <= channel < self._pwmCount:
+            raise ValueError("Channel %d out of range [%d..%d]" % (channel, 0, self._pwmCount-1))
+
+    def checkPWMValue(self, value):
+        if not 0 <= value <= self._pwmMax:
+            raise ValueError("Value %d out of range [%d..%d]" % (value, 0, self._pwmMax))
+    
+    def __pwmRead__(self, channel):
+        raise NotImplementedError
+    
+    def __pwmWrite__(self, channel, value):
+        raise NotImplementedError
+    
+    @request("GET", "pwm/count")
+    @response("%d")
+    def pwmCount(self):
+        return self._pwmCount
+
+    @request("GET", "pwm/resolution")
+    @response("%d")
+    def pwmResolution(self):
+        return self._pwmResolution
+    
+    @request("GET", "pwm/max")
+    @response("%d")
+    def pwmMaximum(self):
+        return int(self._pwmMax)
+    
+    @request("GET", "pwm/%(channel)d/integer")
+    @response("%d")
+    def pwmRead(self, channel):
+        self.checkPWMChannel(channel)
+        return self.__pwmRead__(channel)
+    
+    @request("GET", "pwm/%(channel)d/float")
+    @response("%.2f")
+    def pwmReadFloat(self, channel):
+        return self.pwmRead(channel) / float(self._pwmMax)
+    
+    @request("POST", "pwm/%(channel)d/integer/%(value)d")
+    @response("%d")    
+    def pwmWrite(self, channel, value):
+        self.checkPWMChannel(channel)
+        self.checkPWMValue(value)
+        self.__pwmWrite__(channel, value)
+        return self.pwmRead(channel)
+    
+    @request("POST", "pwm/%(channel)d/float/%(value)f")        
+    @response("%.2f")    
+    def pwmWriteFloat(self, channel, value):
+        self.pwmWrite(channel, int(value * self._pwmMax))
+        return self.pwmReadFloat(channel)
+    
+    def getReverse(self, channel):
+        self.checkChannel(channel)
+        return self.reverse[channel]
+    
+    def setReverse(self, channel, value):
+        self.checkChannel(channel)
+        self.reverse[channel] = value
+        return value
+    
+    def RatioToAngle(self, value):
+        f = value
+        f *= self.period
+        f -= self.servo_neutral
+        f *= self.servo_travel_angle
+        f /= self.servo_travel_time
+        return f
+
+    def AngleToRatio(self, value):
+        f = value
+        f *= self.servo_travel_time
+        f /= self.servo_travel_angle
+        f += self.servo_neutral
+        f /= self.period
+        return f
+    
+    @request("GET", "pwm/%(channel)d/angle")
+    @response("%.2f")
+    def pwmReadAngle(self, channel):
+        f = self.pwmReadFloat(channel)
+        f = self.RatioToAngle(f)
+        if self.reverse[channel]:
+            f = -f
+        else:
+            f = f
+        return f
+        
+    @request("POST", "pwm/%(channel)d/angle/%(value)f")
+    @response("%.2f")
+    def pwmWriteAngle(self, channel, value):
+        if self.reverse[channel]:
+            f = -value
+        else:
+            f = value
+        f = self.AngleToRatio(f)
+        self.pwmWriteFloat(channel, f)
+        return self.pwmReadAngle(channel)
+
+    @request("GET", "pwm/*")
+    @response(contentType=M_JSON)
+    def pwmWildcard(self):
+        values = {}
+        for i in range(self._pwmCount):
+            val = self.pwmReadFloat(i)
+            values[i] = {}
+            values[i]["float"] = float("%.2f" % val)
+            values[i]["angle"] = float("%.2f" % self.RatioToAngle(val))
+        return values
+    
+DRIVERS = {}
+DRIVERS["ads1x1x"] = ["ADS1014", "ADS1015", "ADS1114", "ADS1115"]
+DRIVERS["mcp3x0x"] = ["MCP3004", "MCP3008", "MCP3204", "MCP3208"]
+DRIVERS["mcp4725"] = ["MCP4725"]
+DRIVERS["mcp492X"] = ["MCP4921", "MCP4922"]
+DRIVERS["pca9685"] = ["PCA9685"]
diff --git a/python/webiopi/devices/analog/ads1x1x.py b/python/webiopi/devices/analog/ads1x1x.py
new file mode 100644
index 0000000..969fd8f
--- /dev/null
+++ b/python/webiopi/devices/analog/ads1x1x.py
@@ -0,0 +1,82 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from time import sleep
+from webiopi.utils.types import toint, signInteger
+from webiopi.devices.i2c import I2C
+from webiopi.devices.analog import ADC
+
+
+class ADS1X1X(ADC, I2C):
+    VALUE     = 0x00
+    CONFIG    = 0x01
+    LO_THRESH = 0x02
+    HI_THRESH = 0x03
+    
+    CONFIG_STATUS_MASK  = 0x80
+    CONFIG_CHANNEL_MASK = 0x70
+    CONFIG_GAIN_MASK    = 0x0E
+    CONFIG_MODE_MASK    = 0x01
+    
+    def __init__(self, slave, channelCount, resolution, name):
+        I2C.__init__(self, toint(slave))
+        ADC.__init__(self, channelCount, resolution, 4.096)
+        self._analogMax = 2**(resolution-1)
+        self.name = name
+        
+        config = self.readRegisters(self.CONFIG, 2)
+        
+        mode = 0 # continuous
+        config[0] &= ~self.CONFIG_MODE_MASK
+        config[0] |= mode
+        
+        gain = 0x1 # FS = +/- 4.096V
+        config[0] &= ~self.CONFIG_GAIN_MASK
+        config[0] |= gain << 1
+        
+        self.writeRegisters(self.CONFIG, config)
+    
+    def __str__(self):
+        return "%s(slave=0x%02X)" % (self.name, self.slave)
+        
+    def __analogRead__(self, channel, diff=False):
+        config = self.readRegisters(self.CONFIG, 2)
+        config[0] &= ~self.CONFIG_CHANNEL_MASK
+        if diff:
+            config[0] |= channel << 4
+        else:
+            config[0] |= (channel + 4) << 4
+        self.writeRegisters(self.CONFIG, config)
+        sleep(0.001)
+        d = self.readRegisters(self.VALUE, 2)
+        value = (d[0] << 8 | d[1]) >> (16-self._analogResolution)
+        return signInteger(value, self._analogResolution)
+
+
+class ADS1014(ADS1X1X):
+    def __init__(self, slave=0x48):
+        ADS1X1X.__init__(self, slave, 1, 12, "ADS1014")
+
+class ADS1015(ADS1X1X):
+    def __init__(self, slave=0x48):
+        ADS1X1X.__init__(self, slave, 4, 12, "ADS1015")
+
+class ADS1114(ADS1X1X):
+    def __init__(self, slave=0x48):
+        ADS1X1X.__init__(self, slave, 1, 16, "ADS1114")
+
+class ADS1115(ADS1X1X):
+    def __init__(self, slave=0x48):
+        ADS1X1X.__init__(self, slave, 4, 16, "ADS1115")
+
diff --git a/python/webiopi/devices/analog/mcp3x0x.py b/python/webiopi/devices/analog/mcp3x0x.py
new file mode 100644
index 0000000..6a23bf0
--- /dev/null
+++ b/python/webiopi/devices/analog/mcp3x0x.py
@@ -0,0 +1,75 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from webiopi.utils.types import toint
+from webiopi.devices.spi import SPI
+from webiopi.devices.analog import ADC
+
+class MCP3X0X(SPI, ADC):
+    def __init__(self, chip, channelCount, resolution, name):
+        SPI.__init__(self, toint(chip), 0, 8, 10000)
+        ADC.__init__(self, channelCount, resolution, 3.3)
+        self.name = name
+        self.MSB_MASK = 2**(resolution-8) - 1
+
+    def __str__(self):
+        return "%s(chip=%d)" % (self.name, self.chip)
+
+    def __analogRead__(self, channel, diff):
+        data = self.__command__(channel, diff)
+        r = self.xfer(data)
+        return ((r[1] & self.MSB_MASK) << 8) | r[2]
+    
+class MCP300X(MCP3X0X):
+    def __init__(self, chip, channelCount, name):
+        MCP3X0X.__init__(self, chip, channelCount, 10, name)
+
+    def __command__(self, channel, diff):
+        d = [0x00, 0x00, 0x00]
+        d[0] |= 1
+        d[1] |= (not diff) << 7
+        d[1] |= ((channel >> 2) & 0x01) << 6
+        d[1] |= ((channel >> 1) & 0x01) << 5
+        d[1] |= ((channel >> 0) & 0x01) << 4
+        return d
+        
+class MCP3004(MCP300X):
+    def __init__(self, chip=0):
+        MCP300X.__init__(self, chip, 4, "MCP3004")
+        
+class MCP3008(MCP300X):
+    def __init__(self, chip=0):
+        MCP300X.__init__(self, chip, 8, "MCP3008")
+        
+class MCP320X(MCP3X0X):
+    def __init__(self, chip, channelCount, name):
+        MCP3X0X.__init__(self, chip, channelCount, 12, name)
+
+    def __command__(self, channel, diff):
+        d = [0x00, 0x00, 0x00]
+        d[0] |= 1 << 2
+        d[0] |= (not diff) << 1
+        d[0] |= (channel >> 2) & 0x01
+        d[1] |= ((channel >> 1) & 0x01) << 7
+        d[1] |= ((channel >> 0) & 0x01) << 6
+        return d
+    
+class MCP3204(MCP320X):
+    def __init__(self, chip=0):
+        MCP320X.__init__(self, chip, 4, "MCP3204")
+        
+class MCP3208(MCP320X):
+    def __init__(self, chip=0):
+        MCP320X.__init__(self, chip, 8, "MCP3208")
+        
diff --git a/python/webiopi/devices/analog/mcp4725.py b/python/webiopi/devices/analog/mcp4725.py
new file mode 100644
index 0000000..a46337d
--- /dev/null
+++ b/python/webiopi/devices/analog/mcp4725.py
@@ -0,0 +1,38 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from webiopi.utils.types import toint
+from webiopi.devices.i2c import I2C
+from webiopi.devices.analog import DAC
+
+
+class MCP4725(DAC, I2C):
+    def __init__(self, slave=0x60):
+        I2C.__init__(self, toint(slave))
+        DAC.__init__(self, 1, 12, 3.3)
+        
+    def __str__(self):
+        return "MCP4725(slave=0x%02X)" % self.slave
+
+    def __analogRead__(self, channel, diff=False):
+        d = self.readBytes(3)
+        value = (d[1] << 8 | d[2]) >> 4
+        return value
+        
+    
+    def __analogWrite__(self, channel, value):
+        d = bytearray(2)
+        d[0] = (value >> 8) & 0x0F
+        d[1] = value & 0xFF
+        self.writeBytes(d)
\ No newline at end of file
diff --git a/python/webiopi/devices/analog/mcp492X.py b/python/webiopi/devices/analog/mcp492X.py
new file mode 100644
index 0000000..4489149
--- /dev/null
+++ b/python/webiopi/devices/analog/mcp492X.py
@@ -0,0 +1,53 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from webiopi.utils.types import toint
+from webiopi.devices.spi import SPI
+from webiopi.devices.analog import DAC
+
+class MCP492X(SPI, DAC):
+    def __init__(self, chip, channelCount):
+        SPI.__init__(self, toint(chip), 0, 8, 10000000)
+        DAC.__init__(self, channelCount, 12, 3.3)
+        self.buffered=False
+        self.gain=False
+        self.shutdown=False
+        self.values = [0 for i in range(channelCount)]
+
+    def __str__(self):
+        return "MCP492%d(chip=%d)" % (self._analogCount, self.chip)
+
+    def __analogRead__(self, channel, diff=False):
+        return self.values[channel]
+        
+    def __analogWrite__(self, channel, value):
+        d = bytearray(2)
+        d[0]  = 0
+        d[0] |= (channel & 0x01) << 7
+        d[0] |= (self.buffered & 0x01) << 6
+        d[0] |= (not self.gain & 0x01) << 5
+        d[0] |= (not self.shutdown & 0x01) << 4
+        d[0] |= (value >> 8) & 0x0F
+        d[1]  = value & 0xFF
+        self.writeBytes(d)
+        self.values[channel] = value
+
+class MCP4921(MCP492X):
+    def __init__(self, chip=0):
+        MCP492X.__init__(self, chip, 1)
+
+class MCP4922(MCP492X):
+    def __init__(self, chip=0):
+        MCP492X.__init__(self, chip, 2)
+
diff --git a/python/webiopi/devices/analog/pca9685.py b/python/webiopi/devices/analog/pca9685.py
new file mode 100644
index 0000000..3b91121
--- /dev/null
+++ b/python/webiopi/devices/analog/pca9685.py
@@ -0,0 +1,63 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+import time
+from webiopi.utils.types import toint
+from webiopi.devices.i2c import I2C
+from webiopi.devices.analog import PWM
+
+class PCA9685(PWM, I2C):
+    MODE1    = 0x00
+    PWM_BASE = 0x06
+    PRESCALE = 0xFE
+    
+    M1_SLEEP    = 1<<4
+    M1_AI       = 1<<5
+    M1_RESTART  = 1<<7
+    
+    def __init__(self, slave=0x40, frequency=50):
+        I2C.__init__(self, toint(slave))
+        PWM.__init__(self, 16, 12, toint(frequency))
+        self.VREF = 0
+        
+        self.prescale = int(25000000.0/((2**12)*self.frequency))
+        self.mode1 = self.M1_RESTART | self.M1_AI
+        
+        self.writeRegister(self.MODE1, self.M1_SLEEP)
+        self.writeRegister(self.PRESCALE, self.prescale)
+        time.sleep(0.01)
+
+        self.writeRegister(self.MODE1, self.mode1)
+        
+    def __str__(self):
+        return "PCA9685(slave=0x%02X)" % self.slave
+
+    def getChannelAddress(self, channel):
+        return int(channel * 4 + self.PWM_BASE) 
+
+    def __pwmRead__(self, channel):
+        addr = self.getChannelAddress(channel)
+        d = self.readRegisters(addr, 4)
+        start = d[1] << 8 | d[0]
+        end   = d[3] << 8 | d[2]
+        return end-start
+    
+    def __pwmWrite__(self, channel, value):
+        addr = self.getChannelAddress(channel)
+        d = bytearray(4)
+        d[0] = 0
+        d[1] = 0
+        d[2] = (value & 0x0FF)
+        d[3] = (value & 0xF00) >> 8
+        self.writeRegisters(addr, d)
diff --git a/python/webiopi/devices/bus.py b/python/webiopi/devices/bus.py
new file mode 100644
index 0000000..cd271e0
--- /dev/null
+++ b/python/webiopi/devices/bus.py
@@ -0,0 +1,117 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+import os
+import time
+import subprocess
+
+from webiopi.utils.logger import debug, info
+
+BUSLIST = {
+    "I2C": {"enabled": False, "gpio": {0:"SDA", 1:"SCL", 2:"SDA", 3:"SCL"}, "modules": ["i2c-bcm2708", "i2c-dev"]},
+    "SPI": {"enabled": False, "gpio": {7:"CE1", 8:"CE0", 9:"MISO", 10:"MOSI", 11:"SCLK"}, "modules": ["spi-bcm2708", "spidev"]},
+    "UART": {"enabled": False, "gpio": {14:"TX", 15:"RX"}},
+    "ONEWIRE": {"enabled": False, "gpio": {4:"DATA"}, "modules": ["w1-gpio"], "wait": 2}
+}
+
+def loadModule(module):
+    debug("Loading module : %s" % module)
+    subprocess.call(["modprobe", module])
+    
+def unloadModule(module):
+    subprocess.call(["modprobe", "-r", module])
+    
+def loadModules(bus):
+    if BUSLIST[bus]["enabled"] == False and not modulesLoaded(bus):
+        info("Loading %s modules" % bus)
+        for module in BUSLIST[bus]["modules"]:
+            loadModule(module)
+        if "wait" in BUSLIST[bus]:
+            info("Sleeping %ds to let %s modules load" % (BUSLIST[bus]["wait"], bus))
+            time.sleep(BUSLIST[bus]["wait"])
+
+    BUSLIST[bus]["enabled"] = True
+
+def unloadModules(bus):
+    info("Unloading %s modules" % bus)
+    for module in BUSLIST[bus]["modules"]:
+        unloadModule(module)
+    BUSLIST[bus]["enabled"] = False
+        
+def __modulesLoaded__(modules, lines):
+    if len(modules) == 0:
+        return True
+    for line in lines:
+        if modules[0].replace("-", "_") == line.split(" ")[0]:
+            return __modulesLoaded__(modules[1:], lines)
+    return False
+
+def modulesLoaded(bus):
+    if not bus in BUSLIST or not "modules" in BUSLIST[bus]:
+        return True
+
+    try:
+        with open("/proc/modules") as f:
+            c = f.read()
+            f.close()
+            lines = c.split("\n")
+            return __modulesLoaded__(BUSLIST[bus]["modules"], lines)
+    except:
+        return False
+
+def checkAllBus():
+    for bus in BUSLIST:
+        if modulesLoaded(bus):
+            BUSLIST[bus]["enabled"] = True
+
+class Bus():
+    def __init__(self, busName, device, flag=os.O_RDWR):
+        loadModules(busName)
+        self.busName = busName
+        self.device = device
+        self.flag = flag
+        self.fd = 0
+        self.open()
+        
+    def open(self):
+        self.fd = os.open(self.device, self.flag)
+        if self.fd < 0:
+            raise Exception("Cannot open %s" % self.device)
+
+    def close(self):
+        if self.fd > 0:
+            os.close(self.fd)
+    
+    def read(self, size=1):
+        if self.fd > 0:
+            return os.read(self.fd, size)
+        raise Exception("Device %s not open" % self.device)
+    
+    def readBytes(self, size=1):
+        return bytearray(self.read(size))
+    
+    def readByte(self):
+        return self.readBytes()[0]
+
+    def write(self, string):
+        if self.fd > 0:
+            return os.write(self.fd, string)
+        raise Exception("Device %s not open" % self.device)
+    
+    def writeBytes(self, data):
+        return self.write(bytearray(data))
+
+    def writeByte(self, value):
+        self.writeBytes([value])
+        
diff --git a/python/webiopi/devices/digital/__init__.py b/python/webiopi/devices/digital/__init__.py
new file mode 100644
index 0000000..2c992b3
--- /dev/null
+++ b/python/webiopi/devices/digital/__init__.py
@@ -0,0 +1,144 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from webiopi.decorators.rest import request, response
+from webiopi.utils.types import M_JSON
+
+class GPIOPort():
+    IN  = 0
+    OUT = 1
+    
+    LOW  = False
+    HIGH = True
+    
+    def __init__(self, channelCount):
+        self.digitalChannelCount = channelCount
+        
+    def checkDigitalChannel(self, channel):
+        if not 0 <= channel < self.digitalChannelCount:
+            raise ValueError("Channel %d out of range [%d..%d]" % (channel, 0, self.digitalChannelCount-1))
+
+    def checkDigitalValue(self, value):
+        if not (value == 0 or value == 1):
+            raise ValueError("Value %d not in {0, 1}")
+    
+
+    @request("GET", "count")
+    @response("%d")
+    def digitalCount(self):
+        return self.digitalChannelCount
+
+    def __family__(self):
+        return "GPIOPort"
+    
+    def __getFunction__(self, channel):
+        raise NotImplementedError
+    
+    def __setFunction__(self, channel, func):
+        raise NotImplementedError
+    
+    def __digitalRead__(self, chanel):
+        raise NotImplementedError
+        
+    def __portRead__(self):
+        raise NotImplementedError
+    
+    def __digitalWrite__(self, chanel, value):
+        raise NotImplementedError
+        
+    def __portWrite__(self, value):
+        raise NotImplementedError
+    
+    def getFunction(self, channel):
+        self.checkDigitalChannel(channel)
+        return self.__getFunction__(channel)  
+    
+    @request("GET", "%(channel)d/function")
+    def getFunctionString(self, channel):
+        func = self.getFunction(channel)
+        if func == self.IN:
+            return "IN"
+        elif func == self.OUT:
+            return "OUT"
+#        elif func == GPIO.PWM:
+#            return "PWM"
+        else:
+            return "UNKNOWN"
+        
+    def setFunction(self, channel, value):
+        self.checkDigitalChannel(channel)
+        self.__setFunction__(channel, value)
+        return self.getFunction(channel)
+
+    @request("POST", "%(channel)d/function/%(value)s")
+    def setFunctionString(self, channel, value):
+        value = value.lower()
+        if value == "in":
+            self.setFunction(channel, self.IN)
+        elif value == "out":
+            self.setFunction(channel, self.OUT)
+#        elif value == "pwm":
+#            self.setFunction(channel, GPIO.PWM)
+        else:
+            raise ValueError("Bad Function")
+        return self.getFunctionString(channel)  
+
+    @request("GET", "%(channel)d/value")
+    @response("%d")
+    def digitalRead(self, channel):
+        self.checkDigitalChannel(channel)
+        return self.__digitalRead__(channel)
+
+    @request("GET", "*")
+    @response(contentType=M_JSON)
+    def wildcard(self, compact=False):
+        if compact:
+            f = "f"
+            v = "v"
+        else:
+            f = "function"
+            v = "value"
+            
+        values = {}
+        for i in range(self.digitalChannelCount):
+            if compact:
+                func = self.getFunction(i)
+            else:
+                func = self.getFunctionString(i)
+            values[i] = {f: func, v: int(self.digitalRead(i))}
+        return values
+
+    @request("GET", "*/integer")
+    @response("%d")
+    def portRead(self):
+        return self.__portRead__()
+    
+    @request("POST", "%(channel)d/value/%(value)d")
+    @response("%d")
+    def digitalWrite(self, channel, value):
+        self.checkDigitalChannel(channel)
+        self.checkDigitalValue(value)
+        self.__digitalWrite__(channel, value)
+        return self.digitalRead(channel)  
+
+    @request("POST", "*/integer/%(value)d")
+    @response("%d")
+    def portWrite(self, value):
+        self.__portWrite__(value)
+        return self.portRead()
+
+DRIVERS = {}    

+DRIVERS["mcp23XXX"] = ["MCP23008", "MCP23009", "MCP23017", "MCP23018", "MCP23S08", "MCP23S09", "MCP23S17", "MCP23S18"]

+DRIVERS["pcf8574" ] = ["PCF8574", "PCF8574A"]

+DRIVERS["ds2408" ] = ["DS2408"]
diff --git a/python/webiopi/devices/digital/ds2408.py b/python/webiopi/devices/digital/ds2408.py
new file mode 100644
index 0000000..4784593
--- /dev/null
+++ b/python/webiopi/devices/digital/ds2408.py
@@ -0,0 +1,84 @@
+#   Copyright 2013 Stuart Marsden

+#

+#   Licensed under the Apache License, Version 2.0 (the "License");

+#   you may not use this file except in compliance with the License.

+#   You may obtain a copy of the License at

+#

+#       http://www.apache.org/licenses/LICENSE-2.0

+#

+#   Unless required by applicable law or agreed to in writing, software

+#   distributed under the License is distributed on an "AS IS" BASIS,

+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+#   See the License for the specific language governing permissions and

+#   limitations under the License.

+

+from webiopi.devices.onewire import OneWire

+from webiopi.devices.digital import GPIOPort

+

+class DS2408(OneWire, GPIOPort):

+    FUNCTIONS = [GPIOPort.IN for i in range(8)]

+

+    def __init__(self, slave=None):

+        OneWire.__init__(self, slave, 0x29, "2408")

+        GPIOPort.__init__(self, 8)

+        self.portWrite(0x00)

+    

+    def __str__(self):

+        return "DS2408(slave=%s)" % self.slave

+    

+    def __getFunction__(self, channel):

+        return self.FUNCTIONS[channel]

+      

+    def __setFunction__(self, channel, value):

+        if not value in [self.IN, self.OUT]:

+            raise ValueError("Requested function not supported")

+        self.FUNCTIONS[channel] = value

+        if value == self.IN:

+            self.__output__(channel, 0)

+

+    def __digitalRead__(self, channel):

+        mask = 1 << channel

+        d = self.readState()

+        if d != None:

+            return (d & mask) == mask

+

+        

+    def __digitalWrite__(self, channel, value):

+        mask = 1 << channel

+        b = self.readByte()

+        if value:

+            b |= mask

+        else:

+            b &= ~mask

+        self.writeByte(b)

+        

+    def __portWrite__(self, value):

+        self.writeByte(value)

+        

+    def __portRead__(self):

+        return self.readByte()

+        

+    def readState(self):

+        try:

+            with open("/sys/bus/w1/devices/%s/state" % self.slave, "rb") as f:

+                data = f.read(1)

+            return ord(data)

+        except IOError:

+            return -1

+

+    def readByte(self):

+        try:

+            with open("/sys/bus/w1/devices/%s/output" % self.slave, "rb") as f:

+                data = f.read(1)

+            return bytearray(data)[0]

+        except IOError:

+            return -1

+      

+    def writeByte(self, value):

+        try:

+            with open("/sys/bus/w1/devices/%s/output" % self.slave, "wb") as f:

+                f.write(bytearray([value]))

+        except IOError:

+                pass

+            

+        

diff --git a/python/webiopi/devices/digital/gpio.py b/python/webiopi/devices/digital/gpio.py
new file mode 100644
index 0000000..5da6cc5
--- /dev/null
+++ b/python/webiopi/devices/digital/gpio.py
@@ -0,0 +1,189 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from webiopi.utils.types import M_JSON
+from webiopi.utils.logger import debug
+from webiopi.devices.digital import GPIOPort
+from webiopi.decorators.rest import request, response
+try:
+    import _webiopi.GPIO as GPIO
+except:
+    pass
+
+EXPORT = []
+
+class NativeGPIO(GPIOPort):
+    def __init__(self):
+        GPIOPort.__init__(self, 54)
+        self.export = range(54)
+        self.post_value = True
+        self.post_function = True
+        self.gpio_setup = []
+        self.gpio_reset = []
+        
+    def __str__(self):
+        return "GPIO"
+    
+    def addGPIO(self, lst, gpio, params):
+        gpio = int(gpio)
+        params = params.split(" ")
+        func = params[0].lower()
+        if func == "in":
+            func = GPIO.IN
+        elif func == "out":
+            func = GPIO.OUT
+        else:
+            raise Exception("Unknown function")
+        
+        value = -1
+        if len(params) > 1:
+            value = int(params[1])
+        lst.append({"gpio": gpio, "func": func, "value": value})
+    
+    def addGPIOSetup(self, gpio, params):
+        self.addGPIO(self.gpio_setup, gpio, params)
+        
+    def addGPIOReset(self, gpio, params):
+        self.addGPIO(self.gpio_reset, gpio, params)
+        
+    def addSetups(self, gpios):
+        for (gpio, params) in gpios:
+            self.addGPIOSetup(gpio, params)
+
+    def addResets(self, gpios):
+        for (gpio, params) in gpios:
+            self.addGPIOReset(gpio, params)
+    
+    def setup(self):
+        for g in self.gpio_setup:
+            gpio = g["gpio"]
+            debug("Setup GPIO %d" % gpio)
+            GPIO.setFunction(gpio, g["func"])
+            if g["value"] >= 0 and GPIO.getFunction(gpio) == GPIO.OUT:
+                GPIO.digitalWrite(gpio, g["value"])
+    
+    def close(self):
+        for g in self.gpio_reset:
+            gpio = g["gpio"]
+            debug("Reset GPIO %d" % gpio)
+            GPIO.setFunction(gpio, g["func"])
+            if g["value"] >= 0 and GPIO.getFunction(gpio) == GPIO.OUT:
+                GPIO.digitalWrite(gpio, g["value"])
+        
+    def checkDigitalChannelExported(self, channel):
+        if not channel in self.export:
+            raise GPIO.InvalidChannelException("Channel %d is not allowed" % channel)
+        
+    def checkPostingFunctionAllowed(self):
+        if not self.post_function:
+            raise ValueError("POSTing function to native GPIO not allowed")
+    
+    def checkPostingValueAllowed(self):
+        if not self.post_value:
+            raise ValueError("POSTing value to native GPIO not allowed")
+    
+    def __digitalRead__(self, channel):
+        self.checkDigitalChannelExported(channel)
+        return GPIO.digitalRead(channel)
+    
+    def __digitalWrite__(self, channel, value):
+        self.checkDigitalChannelExported(channel)
+        self.checkPostingValueAllowed()
+        GPIO.digitalWrite(channel, value)
+
+    def __getFunction__(self, channel):
+        self.checkDigitalChannelExported(channel)
+        return GPIO.getFunction(channel)
+    
+    def __setFunction__(self, channel, value):
+        self.checkDigitalChannelExported(channel)
+        self.checkPostingFunctionAllowed()
+        GPIO.setFunction(channel, value)
+        
+    def __portRead__(self):
+        value = 0
+        for i in self.export:
+            value |= GPIO.digitalRead(i) << i
+        return value 
+            
+    def __portWrite__(self, value):
+        if len(self.export) < 54:
+            for i in self.export:
+                if GPIO.getFunction(i) == GPIO.OUT:
+                    GPIO.digitalWrite(i, (value >> i) & 1)
+        else:
+            raise Exception("Please limit exported GPIO to write integers")
+            
+    @request("GET", "*")
+    @response(contentType=M_JSON)
+    def wildcard(self, compact=False):
+        if compact:
+            f = "f"
+            v = "v"
+        else:
+            f = "function"
+            v = "value"
+            
+        values = {}
+        print(self.export)
+        for i in self.export:
+            if compact:
+                func = GPIO.getFunction(i)
+            else:
+                func = GPIO.getFunctionString(i)
+            values[i] = {f: func, v: int(GPIO.digitalRead(i))}
+        return values
+
+    
+    @request("GET", "%(channel)d/pulse", "%s")
+    def getPulse(self, channel):
+        self.checkDigitalChannelExported(channel)
+        self.checkDigitalChannel(channel)
+        return GPIO.getPulse(channel)
+    
+    @request("POST", "%(channel)d/sequence/%(args)s")
+    @response("%d")
+    def outputSequence(self, channel, args):
+        self.checkDigitalChannelExported(channel)
+        self.checkPostingValueAllowed()
+        self.checkDigitalChannel(channel)
+        (period, sequence) = args.split(",")
+        period = int(period)
+        GPIO.outputSequence(channel, period, sequence)
+        return int(sequence[-1])
+        
+    @request("POST", "%(channel)d/pulse/")
+    def pulse(self, channel):
+        self.checkDigitalChannelExported(channel)
+        self.checkPostingValueAllowed()
+        self.checkDigitalChannel(channel)
+        GPIO.pulse(channel)
+        return "OK"
+        
+    @request("POST", "%(channel)d/pulseRatio/%(value)f")
+    def pulseRatio(self, channel, value):
+        self.checkDigitalChannelExported(channel)
+        self.checkPostingValueAllowed()
+        self.checkDigitalChannel(channel)
+        GPIO.pulseRatio(channel, value)
+        return GPIO.getPulse(channel)
+        
+    @request("POST", "%(channel)d/pulseAngle/%(value)f")
+    def pulseAngle(self, channel, value):
+        self.checkDigitalChannelExported(channel)
+        self.checkPostingValueAllowed()
+        self.checkDigitalChannel(channel)
+        GPIO.pulseAngle(channel, value)
+        return GPIO.getPulse(channel)
+    
diff --git a/python/webiopi/devices/digital/mcp23XXX.py b/python/webiopi/devices/digital/mcp23XXX.py
new file mode 100644
index 0000000..99edd61
--- /dev/null
+++ b/python/webiopi/devices/digital/mcp23XXX.py
@@ -0,0 +1,153 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from webiopi.utils.types import toint
+from webiopi.devices.i2c import I2C
+from webiopi.devices.spi import SPI
+from webiopi.devices.digital import GPIOPort
+
+class MCP23XXX(GPIOPort):
+    IODIR   = 0x00
+    IPOL    = 0x01
+    GPINTEN = 0x02
+    DEFVAL  = 0x03
+    INTCON  = 0x04
+    IOCON   = 0x05
+    GPPU    = 0x06
+    INTF    = 0x07
+    INTCAP  = 0x08
+    GPIO    = 0x09
+    OLAT    = 0x0A
+    
+    def __init__(self, channelCount):
+        GPIOPort.__init__(self, channelCount)
+        self.banks = int(channelCount / 8)
+        
+    def getAddress(self, register, channel=0):
+        return register * self.banks + int(channel / 8)
+
+    def getChannel(self, register, channel):
+        self.checkDigitalChannel(channel)
+        addr = self.getAddress(register, channel) 
+        mask = 1 << (channel % 8)
+        return (addr, mask)
+    
+    def __digitalRead__(self, channel):
+        (addr, mask) = self.getChannel(self.GPIO, channel) 
+        d = self.readRegister(addr)
+        return (d & mask) == mask
+
+    def __digitalWrite__(self, channel, value):
+        (addr, mask) = self.getChannel(self.GPIO, channel) 
+        d = self.readRegister(addr)
+        if value:
+            d |= mask
+        else:
+            d &= ~mask
+        self.writeRegister(addr, d)
+        
+    def __getFunction__(self, channel):
+        (addr, mask) = self.getChannel(self.IODIR, channel) 
+        d = self.readRegister(addr)
+        return self.IN if (d & mask) == mask else self.OUT
+        
+    def __setFunction__(self, channel, value):
+        if not value in [self.IN, self.OUT]:
+            raise ValueError("Requested function not supported")
+
+        (addr, mask) = self.getChannel(self.IODIR, channel) 
+        d = self.readRegister(addr)
+        if value == self.IN:
+            d |= mask
+        else:
+            d &= ~mask
+        self.writeRegister(addr, d)
+
+    def __portRead__(self):
+        value = 0
+        for i in range(self.banks):
+            value |= self.readRegister(self.banks*self.GPIO+i) << 8*i
+        return value
+    
+    def __portWrite__(self, value):
+        for i in range(self.banks):
+            self.writeRegister(self.banks*self.GPIO+i,  (value >> 8*i) & 0xFF)
+
+class MCP230XX(MCP23XXX, I2C):
+    def __init__(self, slave, channelCount, name):
+        I2C.__init__(self, toint(slave))
+        MCP23XXX.__init__(self, channelCount)
+        self.name = name
+        
+    def __str__(self):
+        return "%s(slave=0x%02X)" % (self.name, self.slave)
+
+class MCP23008(MCP230XX):
+    def __init__(self, slave=0x20):
+        MCP230XX.__init__(self, slave, 8, "MCP23008")
+
+class MCP23009(MCP230XX):
+    def __init__(self, slave=0x20):
+        MCP230XX.__init__(self, slave, 8, "MCP23009")
+
+class MCP23017(MCP230XX):
+    def __init__(self, slave=0x20):
+        MCP230XX.__init__(self, slave, 16, "MCP23017")
+
+class MCP23018(MCP230XX):
+    def __init__(self, slave=0x20):
+        MCP230XX.__init__(self, slave, 16, "MCP23018")
+
+class MCP23SXX(MCP23XXX, SPI):
+    SLAVE = 0x20
+    
+    WRITE = 0x00
+    READ  = 0x01
+    
+    def __init__(self, chip, slave, channelCount, name):
+        SPI.__init__(self, toint(chip), 0, 8, 10000000)
+        MCP23XXX.__init__(self, channelCount)
+        self.slave = self.SLAVE
+        iocon_value = 0x08 # Hardware Address Enable
+        iocon_addr  = self.getAddress(self.IOCON)
+        self.writeRegister(iocon_addr, iocon_value)
+        self.slave = toint(slave)
+        self.name = name
+
+    def __str__(self):
+        return "%s(chip=%d, slave=0x%02X)" % (self.name, self.chip, self.slave)
+
+    def readRegister(self, addr):
+        d = self.xfer([(self.slave << 1) | self.READ, addr, 0x00])
+        return d[2]
+
+    def writeRegister(self, addr, value):
+        self.writeBytes([(self.slave << 1) | self.WRITE, addr, value])
+    
+class MCP23S08(MCP23SXX):
+    def __init__(self, chip=0, slave=0x20):
+        MCP23SXX.__init__(self, chip, slave, 8, "MCP23S08")
+
+class MCP23S09(MCP23SXX):
+    def __init__(self, chip=0, slave=0x20):
+        MCP23SXX.__init__(self, chip, slave, 8, "MCP23S09")
+
+class MCP23S17(MCP23SXX):
+    def __init__(self, chip=0, slave=0x20):
+        MCP23SXX.__init__(self, chip, slave, 16, "MCP23S17")
+
+class MCP23S18(MCP23SXX):
+    def __init__(self, chip=0, slave=0x20):
+        MCP23SXX.__init__(self, chip, slave, 16, "MCP23S18")
+
diff --git a/python/webiopi/devices/digital/pcf8574.py b/python/webiopi/devices/digital/pcf8574.py
new file mode 100644
index 0000000..146e8f4
--- /dev/null
+++ b/python/webiopi/devices/digital/pcf8574.py
@@ -0,0 +1,70 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from webiopi.utils.types import toint
+from webiopi.devices.i2c import I2C
+from webiopi.devices.digital import GPIOPort
+
+class PCF8574(I2C, GPIOPort):
+    FUNCTIONS = [GPIOPort.IN for i in range(8)]
+    
+    def __init__(self, slave=0x20):
+        slave = toint(slave)
+        if slave in range(0x20, 0x28):
+            self.name = "PCF8574"
+        elif slave in range(0x38, 0x40):
+            self.name = "PCF8574A"
+        else:
+            raise ValueError("Bad slave address for PCF8574(A) : 0x%02X not in range [0x20..0x27, 0x38..0x3F]" % slave)
+        
+        I2C.__init__(self, slave)
+        GPIOPort.__init__(self, 8)
+        self.portWrite(0xFF)
+        self.portRead()
+    
+    def __str__(self):
+        return "%s(slave=0x%02X)" % (self.name, self.slave)
+        
+    def __getFunction__(self, channel):
+        return self.FUNCTIONS[channel]
+    
+    def __setFunction__(self, channel, value):
+        if not value in [self.IN, self.OUT]:
+            raise ValueError("Requested function not supported")
+        self.FUNCTIONS[channel] = value
+        
+    def __digitalRead__(self, channel):
+        mask = 1 << channel
+        d = self.readByte()
+        return (d & mask) == mask 
+
+    def __portRead__(self):
+        return self.readByte()
+    
+    def __digitalWrite__(self, channel, value):
+        mask = 1 << channel
+        b = self.readByte()
+        if value:
+            b |= mask
+        else:
+            b &= ~mask
+        self.writeByte(b)
+
+    def __portWrite__(self, value):
+        self.writeByte(value)
+        
+class PCF8574A(PCF8574):
+    def __init__(self, slave=0x38):
+        PCF8574.__init__(self, slave)
+        
diff --git a/python/webiopi/devices/i2c.py b/python/webiopi/devices/i2c.py
new file mode 100644
index 0000000..1b3196a
--- /dev/null
+++ b/python/webiopi/devices/i2c.py
@@ -0,0 +1,75 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+import fcntl
+
+from webiopi.utils.version import BOARD_REVISION
+from webiopi.devices.bus import Bus
+
+# /dev/i2c-X ioctl commands.  The ioctl's parameter is always an
+# unsigned long, except for:
+#    - I2C_FUNCS, takes pointer to an unsigned long
+#    - I2C_RDWR, takes pointer to struct i2c_rdwr_ioctl_data
+#    - I2C_SMBUS, takes pointer to struct i2c_smbus_ioctl_data
+
+I2C_RETRIES = 0x0701    # number of times a device address should
+                        # be polled when not acknowledging
+I2C_TIMEOUT = 0x0702    # set timeout in units of 10 ms
+
+# NOTE: Slave address is 7 or 10 bits, but 10-bit addresses
+# are NOT supported! (due to code brokenness)
+
+I2C_SLAVE       = 0x0703    # Use this slave address
+I2C_SLAVE_FORCE = 0x0706    # Use this slave address, even if it
+                            # is already in use by a driver!
+I2C_TENBIT      = 0x0704    # 0 for 7 bit addrs, != 0 for 10 bit
+
+I2C_FUNCS       = 0x0705    # Get the adapter functionality mask
+
+I2C_RDWR        = 0x0707    # Combined R/W transfer (one STOP only)
+
+I2C_PEC         = 0x0708    # != 0 to use PEC with SMBus
+I2C_SMBUS       = 0x0720    # SMBus transfer */
+
+
+class I2C(Bus):
+    def __init__(self, slave):
+        self.channel = 0
+        if BOARD_REVISION > 1:
+            self.channel = 1
+
+        Bus.__init__(self, "I2C", "/dev/i2c-%d" % self.channel)
+        self.slave = slave
+        if fcntl.ioctl(self.fd, I2C_SLAVE, self.slave):
+            raise Exception("Error binding I2C slave 0x%02X" % self.slave)
+        
+    def __str__(self):
+        return "I2C(slave=0x%02X)" % self.slave
+    
+    def readRegister(self, addr):
+        self.writeByte(addr)
+        return self.readByte()
+    
+    def readRegisters(self, addr, count):
+        self.writeByte(addr)
+        return self.readBytes(count)
+    
+    def writeRegister(self, addr, byte):
+        self.writeBytes([addr, byte])
+    
+    def writeRegisters(self, addr, buff):
+        d = bytearray(len(buff)+1)
+        d[0] = addr
+        d[1:] = buff
+        self.writeBytes(d)
diff --git a/python/webiopi/devices/instance.py b/python/webiopi/devices/instance.py
new file mode 100644
index 0000000..633a8c3
--- /dev/null
+++ b/python/webiopi/devices/instance.py
@@ -0,0 +1,6 @@
+DEVICES  = {}
+def deviceInstance(name):
+    if name in DEVICES:
+        return DEVICES[name]["device"]
+    else:
+        return None
diff --git a/python/webiopi/devices/manager.py b/python/webiopi/devices/manager.py
new file mode 100644
index 0000000..0f1e521
--- /dev/null
+++ b/python/webiopi/devices/manager.py
@@ -0,0 +1,77 @@
+import imp
+from webiopi.utils import logger
+from webiopi.utils import types
+from webiopi.devices.instance import DEVICES
+
+from webiopi.devices import serial, digital, analog, sensor, shield
+
+PACKAGES = [serial, digital, analog, sensor, shield]
+def findDeviceClass(name):
+    for package in PACKAGES:
+        if hasattr(package, name):
+            return getattr(package, name)
+        if hasattr(package, "DRIVERS"):
+            for driver in package.DRIVERS:
+                if name in package.DRIVERS[driver]:
+                    (fp, pathname, stuff) = imp.find_module(package.__name__.replace(".", "/") + "/" + driver)
+                    module = imp.load_module(driver, fp, pathname, stuff)
+                    return getattr(module, name)
+    return None
+
+def addDevice(name, device, args):
+    devClass = findDeviceClass(device)
+    if devClass == None:
+        raise Exception("Device driver not found for %s" % device)
+    if len(args) > 0:
+        dev = devClass(**args)
+    else:
+        dev = devClass()
+    addDeviceInstance(name, dev, args)
+
+def addDeviceInstance(name, dev, args):
+    funcs = {"GET": {}, "POST": {}}
+    for att in dir(dev):
+        func = getattr(dev, att)
+        if callable(func) and hasattr(func, "routed"):
+            if name == "GPIO":
+                logger.debug("Mapping %s.%s to REST %s /GPIO/%s" % (dev, att, func.method, func.path))
+            else:
+                logger.debug("Mapping %s.%s to REST %s /devices/%s/%s" % (dev, att, func.method, name, func.path))
+            funcs[func.method][func.path] = func
+    
+    DEVICES[name] = {'device': dev, 'functions': funcs}
+    if name == "GPIO":
+        logger.info("GPIO - Native mapped to REST API /GPIO")
+    else:
+        logger.info("%s - %s mapped to REST API /devices/%s" % (dev.__family__(), dev, name))
+        
+def closeDevices():
+    devices = [k for k in DEVICES.keys()]
+    for name in devices:
+        device = DEVICES[name]["device"]
+        logger.debug("Closing device %s - %s" %  (name, device))
+        del DEVICES[name]
+        device.close()
+
+def getDevicesJSON(compact=False):
+    devname = "name"
+    devtype = "type"
+    
+    devices = []
+    for devName in DEVICES:
+        if devName == "GPIO":
+            continue
+        instance = DEVICES[devName]["device"]
+        if hasattr(instance, "__family__"):
+            family = instance.__family__()
+            if isinstance(family, str):
+                devices.append({devname: devName, devtype:family})
+            else:
+                for fam in family:
+                    devices.append({devname: devName, devtype:fam})
+                    
+        else:
+            devices.append({devname: devName, type:instance.__str__()})
+
+    return types.jsonDumps(sorted(devices, key=lambda dev: dev[devname]))
+
diff --git a/python/webiopi/devices/onewire.py b/python/webiopi/devices/onewire.py
new file mode 100644
index 0000000..b012c90
--- /dev/null
+++ b/python/webiopi/devices/onewire.py
@@ -0,0 +1,74 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+import os
+from webiopi.devices.bus import Bus, loadModule

+

+EXTRAS = {

+    "TEMP": {"loaded": False, "module": "w1-therm"},

+    "2408": {"loaded": False, "module": "w1_ds2408"}

+

+}

+

+def loadExtraModule(name):

+    if EXTRAS[name]["loaded"] == False:
+        loadModule(EXTRAS[name]["module"])
+        EXTRAS[name]["loaded"] = True
+
+class OneWire(Bus):
+    def __init__(self, slave=None, family=0, extra=None):
+        Bus.__init__(self, "ONEWIRE", "/sys/bus/w1/devices/w1_bus_master1/w1_master_slaves", os.O_RDONLY)
+        if self.fd > 0:
+            os.close(self.fd)
+            self.fd = 0
+
+        self.family = family
+        if  slave != None:
+            addr = slave.split("-")
+            if len(addr) == 1:
+                self.slave = "%02x-%s" % (family, slave)
+            elif len(addr) == 2:
+                prefix = int(addr[0], 16)
+                if family > 0 and family != prefix:
+                    raise Exception("1-Wire slave address %s does not match family %02x" % (slave, family))
+                self.slave = slave
+        else:
+            devices = self.deviceList()
+            if len(devices) == 0:
+                raise Exception("No device match family %02x" % family)
+            self.slave = devices[0]
+
+        loadExtraModule(extra)
+        
+    def __str__(self):
+        return "1-Wire(slave=%s)" % self.slave
+    
+    def deviceList(self):
+        devices = []
+        with open(self.device) as f:
+            lines = f.read().split("\n")
+            if self.family > 0:
+                prefix = "%02x-" % self.family
+                for line in lines:
+                    if line.startswith(prefix):
+                        devices.append(line)
+            else:
+                devices = lines
+        return devices;
+    
+    def read(self):
+        with open("/sys/bus/w1/devices/%s/w1_slave" % self.slave) as f:
+            data = f.read()
+        return data
+
diff --git a/python/webiopi/devices/sensor/__init__.py b/python/webiopi/devices/sensor/__init__.py
new file mode 100644
index 0000000..598a82f
--- /dev/null
+++ b/python/webiopi/devices/sensor/__init__.py
@@ -0,0 +1,177 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from webiopi.utils.types import toint
+from webiopi.utils.types import M_JSON
+from webiopi.devices.instance import deviceInstance
+from webiopi.decorators.rest import request, response
+
+class Pressure():
+    def __init__(self, altitude=0, external=None):
+        self.altitude = toint(altitude)
+        if isinstance(external, str):
+            self.external = deviceInstance(external)
+        else:
+            self.external = external
+        
+        if self.external != None and not isinstance(self.external, Temperature):
+            raise Exception("external must be a Temperature sensor")
+
+    def __family__(self):
+        return "Pressure"
+
+    def __getPascal__(self):
+        raise NotImplementedError
+    
+    def __getPascalAtSea__(self):
+        raise NotImplementedError
+    
+    @request("GET", "sensor/pressure/pa")
+    @response("%d")
+    def getPascal(self):
+        return self.__getPascal__()
+    
+    @request("GET", "sensor/pressure/hpa")
+    @response("%.2f")
+    def getHectoPascal(self):
+        return float(self.__getPascal__()) / 100.0
+    
+    @request("GET", "sensor/pressure/sea/pa")
+    @response("%d")
+    def getPascalAtSea(self):
+        pressure = self.__getPascal__()
+        if self.external != None:
+            k = self.external.getKelvin()
+            if k != 0:
+                return float(pressure) / (1.0 / (1.0 + 0.0065 / k * self.altitude)**5.255)
+        return float(pressure) / (1.0 - self.altitude / 44330.0)**5.255
+
+    @request("GET", "sensor/pressure/sea/hpa")
+    @response("%.2f")
+    def getHectoPascalAtSea(self):
+        return self.getPascalAtSea() / 100.0
+    
+class Temperature():
+    def __family__(self):
+        return "Temperature"
+    
+    def __getKelvin__(self):
+        raise NotImplementedError
+    
+    def __getCelsius__(self):
+        raise NotImplementedError
+
+    def __getFahrenheit__(self):
+        raise NotImplementedError
+    
+    def Kelvin2Celsius(self, value=None):
+        if value == None:
+            value = self.getKelvin()
+        return value - 273.15
+    
+    def Kelvin2Fahrenheit(self, value=None):
+        if value == None:
+            value = self.getKelvin()
+        return value * 1.8 - 459.67
+    
+    def Celsius2Kelvin(self, value=None):
+        if value == None:
+            value = self.getCelsius()
+        return value + 273.15
+    
+    def Celsius2Fahrenheit(self, value=None):
+        if value == None:
+            value = self.getCelsius()
+        return value * 1.8 + 32
+
+    def Fahrenheit2Kelvin(self, value=None):
+        if value == None:
+            value = self.getFahrenheit()
+        return (value - 459.67) / 1.8
+
+    def Fahrenheit2Celsius(self, value=None):
+        if value == None:
+            value = self.getFahrenheit()
+        return (value - 32) / 1.8
+
+    @request("GET", "sensor/temperature/k")
+    @response("%.02f")
+    def getKelvin(self):
+        return self.__getKelvin__()
+    
+    @request("GET", "sensor/temperature/c")
+    @response("%.02f")
+    def getCelsius(self):
+        return self.__getCelsius__()
+    
+    @request("GET", "sensor/temperature/f")
+    @response("%.02f")
+    def getFahrenheit(self):
+        return self.__getFahrenheit__()
+    
+class Luminosity():
+    def __family__(self):
+        return "Luminosity"
+    
+    def __getLux__(self):
+        raise NotImplementedError
+
+    @request("GET", "sensor/luminosity/lx")
+    @response("%.02f")
+    def getLux(self):
+        return self.__getLux__()
+
+class Distance():
+    def __family__(self):
+        return "Distance"
+    
+    def __getMillimeter__(self):
+        raise NotImplementedError
+
+    @request("GET", "sensor/distance/mm")
+    @response("%.02f")
+    def getMillimeter(self):
+        return self.__getMillimeter__()
+    
+    @request("GET", "sensor/distance/cm")
+    @response("%.02f")
+    def getCentimeter(self):
+        return self.getMillimeter() / 10
+    
+    @request("GET", "sensor/distance/m")
+    @response("%.02f")
+    def getMeter(self):
+        return self.getMillimeter() / 1000
+    
+    @request("GET", "sensor/distance/in")
+    @response("%.02f")
+    def getInch(self):
+        return self.getMillimeter() / 0.254
+    
+    @request("GET", "sensor/distance/ft")
+    @response("%.02f")
+    def getFoot(self):
+        return self.getInch() / 12
+    
+    @request("GET", "sensor/distance/yd")
+    @response("%.02f")
+    def getYard(self):
+        return self.getInch() / 36
+    
+DRIVERS = {}
+DRIVERS["bmp085"] = ["BMP085"]
+DRIVERS["onewiretemp"] = ["DS1822", "DS1825", "DS18B20", "DS18S20", "DS28EA00"]
+DRIVERS["tmpXXX"] = ["TMP75", "TMP102", "TMP275"]
+DRIVERS["tslXXXX"] = ["TSL2561", "TSL2561CS", "TSL2561T", "TSL4531", "TSL45311", "TSL45313", "TSL45315", "TSL45317"]
+DRIVERS["vcnl4000"] = ["VCNL4000"]
diff --git a/python/webiopi/devices/sensor/bmp085.py b/python/webiopi/devices/sensor/bmp085.py
new file mode 100644
index 0000000..e21ab9a
--- /dev/null
+++ b/python/webiopi/devices/sensor/bmp085.py
@@ -0,0 +1,100 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+import time
+from webiopi.utils.types import signInteger
+from webiopi.devices.i2c import I2C
+from webiopi.devices.sensor import Temperature, Pressure
+
+class BMP085(I2C, Temperature, Pressure):
+    def __init__(self, altitude=0, external=None):
+        I2C.__init__(self, 0x77)
+        Pressure.__init__(self, altitude, external)
+        
+        self.ac1 = self.readSignedInteger(0xAA)
+        self.ac2 = self.readSignedInteger(0xAC)
+        self.ac3 = self.readSignedInteger(0xAE)
+        self.ac4 = self.readUnsignedInteger(0xB0)
+        self.ac5 = self.readUnsignedInteger(0xB2)
+        self.ac6 = self.readUnsignedInteger(0xB4)
+        self.b1  = self.readSignedInteger(0xB6)
+        self.b2  = self.readSignedInteger(0xB8)
+        self.mb  = self.readSignedInteger(0xBA)
+        self.mc  = self.readSignedInteger(0xBC)
+        self.md  = self.readSignedInteger(0xBE)
+        
+    def __str__(self):
+        return "BMP085"
+    
+    def __family__(self):
+        return [Temperature.__family__(self), Pressure.__family__(self)]
+
+    def readUnsignedInteger(self, address):
+        d = self.readRegisters(address, 2)
+        return d[0] << 8 | d[1]
+    
+    def readSignedInteger(self, address):
+        d = self.readUnsignedInteger(address)
+        return signInteger(d, 16)
+    
+    def readUT(self):
+        self.writeRegister(0xF4, 0x2E)
+        time.sleep(0.01)
+        return self.readUnsignedInteger(0xF6)
+
+    def readUP(self):
+        self.writeRegister(0xF4, 0x34)
+        time.sleep(0.01)
+        return self.readUnsignedInteger(0xF6)
+
+    def getB5(self):
+        ut = self.readUT()
+        x1 = ((ut - self.ac6) * self.ac5) / 2**15
+        x2 = (self.mc * 2**11) / (x1 + self.md)
+        return x1 + x2
+    
+    def __getKelvin__(self):
+        return self.Celsius2Kelvin()
+
+    def __getCelsius__(self):
+        t = (self.getB5() + 8) / 2**4
+        return float(t) / 10.0
+    
+    def __getFahrenheit__(self):
+        return self.Celsius2Fahrenheit()
+
+    def __getPascal__(self):
+        b5 = self.getB5()
+        up = self.readUP()
+        b6 = b5 - 4000
+        x1 = (self.b2 * (b6 * b6 / 2**12)) / 2**11
+        x2 = self.ac2 * b6 / 2**11
+        x3 = x1 + x2
+        b3 = (self.ac1*4 + x3 + 2) / 4
+        
+        x1 = self.ac3 * b6 / 2**13
+        x2 = (self.b1 * (b6 * b6 / 2**12)) / 2**16
+        x3 = (x1 + x2 + 2) / 2**2
+        b4 = self.ac4 * (x3 + 32768) / 2**15
+        b7 = (up-b3) * 50000
+        if b7 < 0x80000000:
+            p = (b7 * 2) / b4
+        else:
+            p = (b7 / b4) * 2
+        
+        x1 = (p / 2**8) * (p / 2**8)
+        x1 = (x1 * 3038) / 2**16
+        x2 = (-7357*p) /  2**16
+        p = p + (x1 + x2 + 3791) / 2**4
+        return int(p)
diff --git a/python/webiopi/devices/sensor/onewiretemp.py b/python/webiopi/devices/sensor/onewiretemp.py
new file mode 100644
index 0000000..703c32d
--- /dev/null
+++ b/python/webiopi/devices/sensor/onewiretemp.py
@@ -0,0 +1,58 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from webiopi.devices.onewire import OneWire
+from webiopi.devices.sensor import Temperature
+
+class OneWireTemp(OneWire, Temperature):
+    def __init__(self, slave=None, family=0, name="1-Wire"):
+        OneWire.__init__(self, slave, family, "TEMP")
+        self.name = name
+        
+    def __str__(self):
+        return "%s(slave=%s)" % (self.name, self.slave)
+    
+    def __getKelvin__(self):
+        return self.Celsius2Kelvin()
+
+    def __getCelsius__(self):
+        data = self.read()
+        lines = data.split("\n")
+        if lines[0].endswith("YES"):
+            i = lines[1].find("=")
+            temp = lines[1][i+1:]
+            return int(temp) / 1000.0
+    
+    def __getFahrenheit__(self):
+        return self.Celsius2Fahrenheit()
+
+class DS18S20(OneWireTemp):
+    def __init__(self, slave=None):
+        OneWireTemp.__init__(self, slave, 0x10, "DS18S20")
+        
+class DS1822(OneWireTemp):
+    def __init__(self, slave=None):
+        OneWireTemp.__init__(self, slave, 0x22, "DS1822")
+        
+class DS18B20(OneWireTemp):
+    def __init__(self, slave=None):
+        OneWireTemp.__init__(self, slave, 0x28, "DS18B20")
+        
+class DS1825(OneWireTemp):
+    def __init__(self, slave=None):
+        OneWireTemp.__init__(self, slave, 0x3B, "DS1825")
+        
+class DS28EA00(OneWireTemp):
+    def __init__(self, slave=None):
+        OneWireTemp.__init__(self, slave, 0x42, "DS28EA00")
diff --git a/python/webiopi/devices/sensor/tmpXXX.py b/python/webiopi/devices/sensor/tmpXXX.py
new file mode 100644
index 0000000..ba41153
--- /dev/null
+++ b/python/webiopi/devices/sensor/tmpXXX.py
@@ -0,0 +1,60 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from webiopi.utils.types import toint, signInteger
+from webiopi.devices.i2c import I2C
+from webiopi.devices.sensor import Temperature
+
+class TMP102(I2C, Temperature):
+    def __init__(self, slave=0x48):
+        I2C.__init__(self, toint(slave))
+        
+    def __str__(self):
+        return "TMP102(slave=0x%02X)" % self.slave
+        
+    def __getKelvin__(self):
+        return self.Celsius2Kelvin()
+
+    def __getCelsius__(self):
+        d = self.readBytes(2)
+        count = ((d[0] << 4) | (d[1] >> 4)) & 0xFFF
+        return signInteger(count, 12)*0.0625
+    
+    def __getFahrenheit__(self):
+        return self.Celsius2Fahrenheit()
+
+class TMP75(TMP102):
+    def __init__(self, slave=0x48, resolution=12):
+        TMP102.__init__(self, slave)
+        resolution = toint(resolution)
+        if not resolution in range(9,13):
+            raise ValueError("%dbits resolution out of range [%d..%d]bits" % (resolution, 9, 12))
+        self.resolution = resolution
+        
+        config  = self.readRegister(0x01)
+        config &= ~0x60
+        config |= (self.resolution - 9) << 5
+        self.writeRegister(0x01, config)
+        self.readRegisters(0x00, 2)
+
+    def __str__(self):
+        return "TMP75(slave=0x%02X, resolution=%d-bits)" % (self.slave, self.resolution)
+        
+class TMP275(TMP75):
+    def __init__(self, slave=0x48, resolution=12):
+        TMP75.__init__(self, slave, resolution)
+
+    def __str__(self):
+        return "TMP275(slave=0x%02X, resolution=%d-bits)" % (self.slave, self.resolution)
+        
diff --git a/python/webiopi/devices/sensor/tslXXXX.py b/python/webiopi/devices/sensor/tslXXXX.py
new file mode 100644
index 0000000..1189d6f
--- /dev/null
+++ b/python/webiopi/devices/sensor/tslXXXX.py
@@ -0,0 +1,247 @@
+#   Copyright 2013 Andreas Riegg

+#

+#   Licensed under the Apache License, Version 2.0 (the "License");

+#   you may not use this file except in compliance with the License.

+#   You may obtain a copy of the License at

+#

+#       http://www.apache.org/licenses/LICENSE-2.0

+#

+#   Unless required by applicable law or agreed to in writing, software

+#   distributed under the License is distributed on an "AS IS" BASIS,

+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+#   See the License for the specific language governing permissions and

+#   limitations under the License.

+#

+#

+#   Changelog

+#

+#   1.0    2013/02/28    Initial release

+#                        

+

+from webiopi.utils.types import toint

+from webiopi.devices.i2c import I2C

+from webiopi.devices.sensor import Luminosity

+

+class TSL_LIGHT_X(I2C, Luminosity):

+    VAL_COMMAND = 0x80

+    REG_CONTROL = 0x00 | VAL_COMMAND

+    REG_CONFIG  = 0x01 | VAL_COMMAND

+

+    VAL_PWON    = 0x03

+    VAL_PWOFF   = 0x00

+    VAL_INVALID = -1

+

+    def __init__(self, slave, time, name="TSL_LIGHT_X"):

+        I2C.__init__(self, toint(slave))

+        self.name = name  

+        self.wake() # devices are powered down after power reset, wake them

+        self.setTime(toint(time))

+

+    def __str__(self):

+        return "%s(slave=0x%02X)" % (self.name, self.slave)

+

+    def wake(self):

+        self.__wake__()

+

+    def __wake__(self):

+        self.writeRegister(self.REG_CONTROL, self.VAL_PWON)

+

+    def sleep(self):

+        self.__sleep__()

+        

+    def __sleep__(self):

+        self.writeRegister(self.REG_CONTROL, self.VAL_PWOFF)

+        

+    def setTime(self, time):

+        self.__setTime__(time)

+

+    def getTime(self):

+        return self.__getTime__()

+            

+class TSL2561X(TSL_LIGHT_X):

+    VAL_TIME_402_MS   = 0x02

+    VAL_TIME_101_MS   = 0x01

+    VAL_TIME_14_MS    = 0x00

+        

+    REG_CHANNEL_0_LOW = 0x0C | TSL_LIGHT_X.VAL_COMMAND

+    REG_CHANNEL_1_LOW = 0x0E | TSL_LIGHT_X.VAL_COMMAND

+    

+    MASK_GAIN         = 0x10

+    MASK_TIME         = 0x03

+  

+    def __init__(self, slave, time, gain, name="TSL2561X"):

+        TSL_LIGHT_X.__init__(self, slave, time, name)             

+        self.setGain(toint(gain))

+

+    def __getLux__(self):

+        ch0_bytes = self.readRegisters(self.REG_CHANNEL_0_LOW, 2)

+        ch1_bytes = self.readRegisters(self.REG_CHANNEL_1_LOW, 2)

+        ch0_word = ch0_bytes[1] << 8 | ch0_bytes[0]

+        ch1_word = ch1_bytes[1] << 8 | ch1_bytes[0]

+        if ch0_word == 0 | ch1_word == 0:

+            return self.VAL_INVALID # Driver security, avoid crash in lux calculation

+        else:

+            scaling = self.time_multiplier * self.gain_multiplier

+            return self.__calculateLux__(scaling * ch0_word, scaling * ch1_word)

+

+    def setGain(self, gain):

+        if gain == 1:

+            bit_gain = 0

+            self.gain_multiplier = 16

+        elif gain == 16:

+            bit_gain = 1

+            self.gain_multiplier = 1

+        else:

+            raise ValueError("Gain %d out of range [%d,%d]" % (gain, 1, 16))

+        new_byte_gain = (bit_gain << 4) & self.MASK_GAIN

+        

+        current_byte_config = self.readRegister(self.REG_CONFIG)

+        new_byte_config = (current_byte_config & ~self.MASK_GAIN) | new_byte_gain

+        self.writeRegister(self.REG_CONFIG, new_byte_config)

+    

+    def getGain(self):

+        current_byte_config = self.readRegister(self.REG_CONFIG)

+        if (current_byte_config & self.MASK_GAIN):

+            return 16

+        else:

+            return 1

+

+    def __setTime__(self, time):

+        if not time in [14, 101, 402]:

+            raise ValueError("Time %d out of range [%d,%d,%d]" % (time, 14, 101, 402))

+        if time == 402:

+            bits_time = self.VAL_TIME_402_MS

+            self.time_multiplier = 1

+        elif time == 101:

+            bits_time = self.VAL_TIME_101_MS

+            self.time_multiplier = 322 / 81

+        elif time == 14:

+            bits_time = self.VAL_TIME_14_MS

+            self.time_multiplier = 322 / 11

+        new_byte_time = bits_time & self.MASK_TIME

+

+        current_byte_config = self.readRegister(self.REG_CONFIG)

+        new_byte_config = (current_byte_config & ~self.MASK_TIME) | new_byte_time

+        self.writeRegister(self.REG_CONFIG, new_byte_config)

+        

+    def __getTime__(self):

+        current_byte_config = self.readRegister(self.REG_CONFIG)

+        bits_time = (current_byte_config & self.MASK_TIME)

+        if bits_time == self.VAL_TIME_402_MS:

+            t = 402

+        elif bits_time == self.VAL_TIME_101_MS:

+            t = 101

+        elif bits_time == self.VAL_TIME_14_MS:

+            t =  14

+        else:

+            t = TSL_LIGHT_X.VAL_INVALID # indicates undefined

+        return t

+          

+class TSL2561CS(TSL2561X):

+    # Package CS (Chipscale) chip version

+    def __init__(self, slave=0x39, time=402,  gain=1):

+        TSL2561X.__init__(self, slave, time, gain, "TSL2561CS")

+

+    def __calculateLux__(self, channel0_value, channel1value):

+        channelRatio = channel1value / channel0_value

+        if 0 < channelRatio <= 0.52:

+            lux = 0.0315 * channel0_value - 0.0593 * channel0_value *(channelRatio**1.4)

+        elif 0.52 < channelRatio <= 0.65:

+            lux = 0.0229 * channel0_value - 0.0291 * channel1value

+        elif 0.65 < channelRatio <= 0.80:

+            lux = 0.0157 * channel0_value - 0.0180 * channel1value

+        elif 0.80 < channelRatio <= 1.30:

+            lux = 0.00338 * channel0_value - 0.00260 * channel1value

+        else: # if channelRatio > 1.30

+            lux = 0

+        return lux

+            

+class TSL2561T(TSL2561X):

+    # Package T (TMB-6)  chip version

+    def __init__(self, slave=0x39, time=402, gain=1):

+        TSL2561X.__init__(self, slave, time, gain, "TSL2561T")

+        

+    def __calculateLux__(self, channel0_value, channel1_value):

+        channel_ratio = channel1_value / channel0_value

+        if 0 < channel_ratio <= 0.50:

+            lux = 0.0304 * channel0_value - 0.062 * channel0_value * (channel_ratio**1.4)

+        elif 0.50 < channel_ratio <= 0.61:

+            lux = 0.0224 * channel0_value - 0.031 * channel1_value

+        elif 0.61 < channel_ratio <= 0.80:

+            lux = 0.0128 * channel0_value - 0.0153 * channel1_value

+        elif 0.80 < channel_ratio <= 1.30:

+            lux = 0.00146 * channel0_value - 0.00112 * channel1_value

+        else: # if channel_ratio > 1.30

+            lux = 0

+        return lux

+

+class TSL2561(TSL2561T):

+    # Default version for unknown packages, uses T Package class lux calculation

+    def __init__(self, slave=0x39, time=402, gain=1):

+        TSL2561X.__init__(self, slave, time, gain, "TSL2561")

+        

+        

+class TSL4531(TSL_LIGHT_X):

+    # Default version for unknown subtypes, uses 0x29 as slave address

+    VAL_TIME_400_MS = 0x00

+    VAL_TIME_200_MS = 0x01

+    VAL_TIME_100_MS = 0x02

+

+    REG_DATA_LOW    = 0x04 | TSL_LIGHT_X.VAL_COMMAND

+    

+    MASK_TCNTRL     = 0x03

+

+    def __init__(self, slave=0x29, time=400, name="TSL4531"):

+        TSL_LIGHT_X.__init__(self, slave, time, name)

+        

+    def __setTime__(self, time):

+        if not time in [100, 200, 400]:

+            raise ValueError("Time %d out of range [%d,%d,%d]" % (time, 100, 200, 400))

+        if time == 400:

+            bits_time = self.VAL_TIME_400_MS

+            self.time_multiplier = 1

+        elif time == 200:

+            bits_time = self.VAL_TIME_200_MS

+            self.time_multiplier = 2

+        elif time == 100:

+            bits_time = self.VAL_TIME_100_MS

+            self.time_multiplier = 4            

+        new_byte_time = bits_time & self.MASK_TCNTRL

+

+        current_byte_config = self.readRegister(self.REG_CONFIG)

+        new_byte_config = (current_byte_config & ~self.MASK_TCNTRL) | new_byte_time

+        self.writeRegister(self.REG_CONFIG, new_byte_config)

+

+    def __getTime__(self):

+        current_byte_config =  self.readRegister(self.REG_CONFIG)

+        bits_time = (current_byte_config & self.MASK_TCNTRL)

+        if bits_time == self.VAL_TIME_400_MS:

+            t = 400

+        elif bits_time == self.VAL_TIME_200_MS:

+            t = 200

+        elif bits_time == self.VAL_TIME_100_MS:

+            t = 100

+        else:

+            t = TSL_LIGHT_X.VAL_INVALID # indicates undefined

+        return t

+

+    def __getLux__(self):

+        data_bytes = self.readRegisters(self.REG_DATA_LOW, 2)

+        return self.time_multiplier * (data_bytes[1] << 8 | data_bytes[0])

+

+class TSL45311(TSL4531):

+    def __init__(self, slave=0x39, time=400):

+        TSL4531.__init__(self, slave, time, "TSL45311")

+

+class TSL45313(TSL4531):

+    def __init__(self, slave=0x39, time=400):

+        TSL4531.__init__(self, slave, time, "TSL45313")

+

+class TSL45315(TSL4531):

+    def __init__(self, slave=0x29, time=400):

+        TSL4531.__init__(self, slave, time, "TSL45315")

+

+class TSL45317(TSL4531):

+    def __init__(self, slave=0x29, time=400):

+        TSL4531.__init__(self, slave, time, "TSL45317")

+

diff --git a/python/webiopi/devices/sensor/vcnl4000.py b/python/webiopi/devices/sensor/vcnl4000.py
new file mode 100644
index 0000000..fb8b40b
--- /dev/null
+++ b/python/webiopi/devices/sensor/vcnl4000.py
@@ -0,0 +1,211 @@
+#   Copyright 2013 Andreas Riegg

+#

+#   Licensed under the Apache License, Version 2.0 (the "License");

+#   you may not use this file except in compliance with the License.

+#   You may obtain a copy of the License at

+#

+#       http://www.apache.org/licenses/LICENSE-2.0

+#

+#   Unless required by applicable law or agreed to in writing, software

+#   distributed under the License is distributed on an "AS IS" BASIS,

+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+#   See the License for the specific language governing permissions and

+#   limitations under the License.

+#

+#

+#   Changelog

+#

+#   1.0    2013/02/24    Initial release. Luminosity is final. Proximity is good beta

+#                        and a working coarse estimation for distance value.

+#                        

+

+import time

+from webiopi.devices.i2c import I2C

+from webiopi.devices.sensor import Luminosity, Distance

+from webiopi.utils.types import toint

+from webiopi.utils.logger import debug 

+

+class VCNL4000(I2C, Luminosity, Distance):

+    REG_COMMAND           = 0x80

+    REG_IR_LED_CURRENT    = 0x83

+    REG_AMB_PARAMETERS    = 0x84

+    REG_AMB_RESULT_HIGH   = 0x85

+    REG_PROX_RESULT_HIGH  = 0x87

+    REG_PROX_FREQUENCY    = 0x89

+    REG_PROX_ADJUST       = 0x8A

+   

+    VAL_MOD_TIMING_DEF    = 129 # default from data sheet

+    

+    VAL_PR_FREQ_3M125HZ   = 0

+    VAL_PR_FREQ_1M5625HZ  = 1

+    VAL_PR_FREQ_781K25HZ  = 2

+    VAL_PR_FREQ_390K625HZ = 3

+    

+    VAL_START_AMB         = 1 << 4

+    VAL_START_PROX        = 1 << 3

+    

+    VAL_INVALID           = -1

+    VAL_NO_PROXIMITY      = -1

+    

+    MASK_PROX_FREQUENCY  = 0b00111111

+    MASK_IR_LED_CURRENT  = 0b00111111

+    MASK_PROX_READY      = 0b00100000

+    MASK_AMB_READY       = 0b01000000

+    

+    def __init__(self, slave=0b0010011, current=20, frequency=781, prox_threshold=15, prox_cycles=10, cal_cycles= 5):

+        I2C.__init__(self, toint(slave))

+        self.setCurrent(toint(current))

+        self.setFrequency(toint(frequency))

+        self.prox_threshold = toint(prox_threshold)

+        self.prox_cycles = toint(prox_cycles)

+        self.cal_cycles = toint(cal_cycles)

+        self.__setProximityTiming__()

+        self.__setAmbientMeasuringMode__()

+        time.sleep(0.001)

+        self.calibrate() # may have to be repeated from time to time or before every proximity measurement

+

+    def __str__(self):

+        return "VCNL4000(slave=0x%02X)" % self.slave

+

+    def __family__(self):

+        return [Luminosity.__family__(self), Distance.__family__(self)]

+

+    def __setProximityTiming__(self):

+        self.writeRegister(self.REG_PROX_ADJUST, self.VAL_MOD_TIMING_DEF)

+                               

+    def __setAmbientMeasuringMode__(self):

+        ambient_parameter_bytes = 1 << 7 | 1 << 3 | 5

+        # Parameter is set to

+        # -continuous conversion mode (bit 7)

+        # -auto offset compensation (bit 3)

+        # -averaging 32 samples (5)

+        self.writeRegister(self.REG_AMB_PARAMETERS, ambient_parameter_bytes)

+

+    def calibrate(self):

+        self.offset = self.__measureOffset__()

+        debug ("VCNL4000: offset = %d" % (self.offset))

+        return self.offset

+

+        

+    def setCurrent(self, current):

+        self.current = current

+        self.__setCurrent__()

+        

+

+    def getCurrent(self):

+        return self.__getCurrent__()

+

+    def setFrequency(self, frequency):

+        self.frequency = frequency

+        self.__setFrequency__()

+

+    def getFrequency(self):

+        return self.__getFrequency__()

+

+    def __setFrequency__(self):

+        if not self.frequency in [391, 781, 1563, 3125]:

+            raise ValueError("Frequency %d out of range [%d,%d,%d,,%d]" % (self.frequency, 391, 781, 1563, 3125))

+        if self.frequency == 391:

+            bits_frequency = self.VAL_PR_FREQ_390K625HZ

+        elif self.frequency == 781:

+            bits_frequency = self.VAL_PR_FREQ_781K25HZ

+        elif self.frequency == 1563:

+            bits_frequency = self.VAL_PR_FREQ_1M5625HZ            

+        elif self.frequency == 3125:

+            bits_frequency = self.VAL_PR_FREQ_3M125HZ

+        self.writeRegister(self.REG_PROX_FREQUENCY, bits_frequency)

+        debug ("VCNL4000: new freq = %d" % (self.readRegister(self.REG_PROX_FREQUENCY)))

+        

+    def __getFrequency__(self):

+        bits_frequency = self.readRegister(self.REG_PROX_FREQUENCY) & self.MASK_PROX_FREQUENCY

+        if bits_frequency == self.VAL_PR_FREQ_390K625HZ:

+            f =  391

+        elif bits_frequency == self.VAL_PR_FREQ_781K25HZ:

+            f =  781

+        elif bits_frequency == self.VAL_PR_FREQ_1M5625HZ:

+            f = 1563

+        elif bits_frequency == self.VAL_PR_FREQ_3M125HZ:

+            f = 3125

+        else:

+            f = self.VAL_INVALID # indicates undefined

+        return f

+

+    def __setCurrent__(self):

+        if not self.current in range(0,201):

+            raise ValueError("%d mA LED current out of range [%d..%d] mA" % (self.current, 0, 201))

+        self.writeRegister(self.REG_IR_LED_CURRENT, int(self.current / 10))       

+        debug ("VCNL4000: new curr = %d" % (self.readRegister(self.REG_IR_LED_CURRENT)))

+        

+    def __getCurrent__(self):

+        bits_current = self.readRegister(self.REG_IR_LED_CURRENT) & self.MASK_IR_LED_CURRENT

+        return bits_current * 10

+        

+    def __getLux__(self):

+        self.writeRegister(self.REG_COMMAND, self.VAL_START_AMB)

+        while not (self.readRegister(self.REG_COMMAND) & self.MASK_AMB_READY):

+            time.sleep(0.001)

+        light_bytes = self.readRegisters(self.REG_AMB_RESULT_HIGH, 2)

+        light_word = light_bytes[0] << 8 | light_bytes[1]

+        return self.__calculateLux__(light_word)

+         

+    def __calculateLux__(self, light_word):

+        return (light_word + 3) * 0.25 # From VISHAY application note

+

+    def __getMillimeter__(self):

+        success = 0

+        fail = 0

+        prox = 0

+        match_cycles = self.prox_cycles

+        while (fail < match_cycles) & (success < match_cycles):

+            real_counts = self.__readProximityCounts__() - self.offset 

+            if real_counts > self.prox_threshold:

+                success += 1

+                prox += real_counts

+            else:

+                fail += 1

+        if fail == match_cycles:

+            return self.VAL_NO_PROXIMITY

+        else:

+            return self.__calculateMillimeter__(prox // match_cycles)

+    

+    def __calculateMillimeter__(self, raw_proximity_counts):

+        # According to chip spec the proximity counts are strong non-linear with distance and cannot be calculated

+        # with a direct formula. From experience found on web this chip is generally not suited for really exact

+        # distance calculations. This is a rough distance estimation lookup table for now. Maybe someone can

+        # provide a more exact approximation in the future.

+

+        debug ("VCNL4000: prox real raw counts = %d" % (raw_proximity_counts))

+        if raw_proximity_counts >= 10000:

+            estimated_distance = 0

+        elif raw_proximity_counts >= 3000:

+            estimated_distance = 5

+        elif raw_proximity_counts >= 900:

+            estimated_distance = 10

+        elif raw_proximity_counts >= 300:

+            estimated_distance = 20

+        elif raw_proximity_counts >= 150:

+            estimated_distance = 30

+        elif raw_proximity_counts >= 75:

+            estimated_distance = 40

+        elif raw_proximity_counts >= 50:

+            estimated_distance = 50

+        elif raw_proximity_counts >= 25:

+            estimated_distance = 70

+        else:

+            estimated_distance = 100

+        return estimated_distance

+    

+    def __measureOffset__(self):

+        offset = 0

+        for unused in range(self.cal_cycles):

+            offset += self.__readProximityCounts__()

+        return offset // self.cal_cycles

+        

+    def __readProximityCounts__(self):

+        self.writeRegister(self.REG_COMMAND, self.VAL_START_PROX)

+        while not (self.readRegister(self.REG_COMMAND) & self.MASK_PROX_READY):

+            time.sleep(0.001)

+        proximity_bytes = self.readRegisters(self.REG_PROX_RESULT_HIGH, 2)

+        debug ("VCNL4000: prox raw value = %d" % (proximity_bytes[0] << 8 | proximity_bytes[1]))

+        return (proximity_bytes[0] << 8 | proximity_bytes[1])

+    
\ No newline at end of file
diff --git a/python/webiopi/devices/serial.py b/python/webiopi/devices/serial.py
new file mode 100644
index 0000000..800f96f
--- /dev/null
+++ b/python/webiopi/devices/serial.py
@@ -0,0 +1,86 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+import os
+import fcntl
+import struct
+import termios
+
+from webiopi.devices.bus import Bus
+from webiopi.decorators.rest import request
+
+TIOCINQ   = hasattr(termios, 'FIONREAD') and termios.FIONREAD or 0x541B
+TIOCM_zero_str = struct.pack('I', 0)
+
+class Serial(Bus):
+    def __init__(self, device="/dev/ttyAMA0", baudrate=9600):
+        if not device.startswith("/dev/"):
+            device = "/dev/%s" % device
+        
+        if isinstance(baudrate, str):
+            baudrate = int(baudrate)
+
+        aname = "B%d" % baudrate
+        if not hasattr(termios, aname):
+            raise Exception("Unsupported baudrate")
+        self.baudrate = baudrate
+
+        Bus.__init__(self, "UART", device, os.O_RDWR | os.O_NOCTTY)
+        fcntl.fcntl(self.fd, fcntl.F_SETFL, os.O_NDELAY)
+        
+        #backup  = termios.tcgetattr(self.fd)
+        options = termios.tcgetattr(self.fd)
+        # iflag
+        options[0] = 0
+
+        # oflag
+        options[1] = 0
+
+        # cflag
+        options[2] |= (termios.CLOCAL | termios.CREAD)
+        options[2] &= ~termios.PARENB
+        options[2] &= ~termios.CSTOPB
+        options[2] &= ~termios.CSIZE
+        options[2] |= termios.CS8
+
+        # lflag
+        options[3] = 0
+
+        speed = getattr(termios, aname)
+        # input speed
+        options[4] = speed
+        # output speed
+        options[5] = speed
+        
+        termios.tcsetattr(self.fd, termios.TCSADRAIN, options)
+        
+    def __str__(self):
+        return "Serial(%s, %dbps)" % (self.device, self.baudrate)
+    
+    def __family__(self):
+        return "Serial"
+    
+    def available(self):
+        s = fcntl.ioctl(self.fd, TIOCINQ, TIOCM_zero_str)
+        return struct.unpack('I',s)[0]
+    
+    @request("GET", "")
+    def read(self):
+        if self.available() > 0:
+            return Bus.read(self, self.available()).decode()
+        return ""
+    
+    @request("POST", "", "data")
+    def write(self, data):
+        Bus.write(self, data)
diff --git a/python/webiopi/devices/shield/__init__.py b/python/webiopi/devices/shield/__init__.py
new file mode 100644
index 0000000..ef77597
--- /dev/null
+++ b/python/webiopi/devices/shield/__init__.py
@@ -0,0 +1,16 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+DRIVERS = {}
+DRIVERS["piface"] = ["PiFaceDigital"]
\ No newline at end of file
diff --git a/python/webiopi/devices/shield/piface.py b/python/webiopi/devices/shield/piface.py
new file mode 100644
index 0000000..ffe6215
--- /dev/null
+++ b/python/webiopi/devices/shield/piface.py
@@ -0,0 +1,66 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from webiopi.utils.types import M_JSON
+from webiopi.devices.digital.mcp23XXX import MCP23S17
+from webiopi.decorators.rest import request, response
+
+
+class PiFaceDigital():
+    def __init__(self, board=0):
+        mcp = MCP23S17(0, 0x20+board)
+        mcp.writeRegister(mcp.getAddress(mcp.IODIR, 0), 0x00) # Port A as output
+        mcp.writeRegister(mcp.getAddress(mcp.IODIR, 8), 0xFF) # Port B as input
+        mcp.writeRegister(mcp.getAddress(mcp.GPPU,  0), 0x00) # Port A PU OFF
+        mcp.writeRegister(mcp.getAddress(mcp.GPPU,  8), 0xFF) # Port B PU ON
+        self.mcp = mcp
+        self.board = board
+        
+    def __str__(self):
+        return "PiFaceDigital(%d)" % self.board 
+
+    def __family__(self):
+        return "PiFaceDigital"
+    
+    def checkChannel(self, channel):
+        if not channel in range(8):
+            raise ValueError("Channel %d invalid" % channel)
+    
+    @request("GET", "digital/input/%(channel)d")
+    @response("%d")
+    def digitalRead(self, channel):
+        self.checkChannel(channel)
+        return not self.mcp.digitalRead(channel+8)
+    
+    @request("POST", "digital/output/%(channel)d/%(value)d")
+    @response("%d")
+    def digitalWrite(self, channel, value):
+        self.checkChannel(channel)
+        return self.mcp.digitalWrite(channel, value)
+    
+    @request("GET", "digital/output/%(channel)d")
+    @response("%d")
+    def digitalReadOutput(self, channel):
+        self.checkChannel(channel)
+        return self.mcp.digitalRead(channel)
+    
+    @request("GET", "digital/*")
+    @response(contentType=M_JSON)
+    def readAll(self):
+        inputs = {}
+        outputs = {}
+        for i in range(8):
+            inputs[i] = self.digitalRead(i)
+            outputs[i] = self.digitalReadOutput(i)
+        return {"input": inputs, "output": outputs}
diff --git a/python/webiopi/devices/spi.py b/python/webiopi/devices/spi.py
new file mode 100644
index 0000000..d19de79
--- /dev/null
+++ b/python/webiopi/devices/spi.py
@@ -0,0 +1,145 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+import fcntl
+import array
+import ctypes
+import struct
+
+from webiopi.utils.version import PYTHON_MAJOR
+from webiopi.devices.bus import Bus
+
+# from spi/spidev.h
+_IOC_NRBITS   =  8
+_IOC_TYPEBITS =  8
+_IOC_SIZEBITS = 14
+_IOC_DIRBITS  =  2
+
+_IOC_NRSHIFT    = 0
+_IOC_TYPESHIFT  = (_IOC_NRSHIFT+_IOC_NRBITS)
+_IOC_SIZESHIFT  = (_IOC_TYPESHIFT+_IOC_TYPEBITS)
+_IOC_DIRSHIFT   = (_IOC_SIZESHIFT+_IOC_SIZEBITS)
+
+_IOC_NONE   = 0
+_IOC_WRITE  = 1
+_IOC_READ   = 2
+
+def _IOC(direction,t,nr,size):
+    return (((direction)  << _IOC_DIRSHIFT) |
+            ((size) << _IOC_SIZESHIFT) |
+            ((t) << _IOC_TYPESHIFT) |
+            ((nr)   << _IOC_NRSHIFT))
+def _IOR(t, number, size):
+    return _IOC(_IOC_READ, t, number, size)
+def _IOW(t, number, size):
+    return _IOC(_IOC_WRITE, t, number, size)
+
+SPI_CPHA        = 0x01
+SPI_CPOL        = 0x02
+
+SPI_MODE_0      = (0|0) 
+SPI_MODE_1      = (0|SPI_CPHA)
+SPI_MODE_2      = (SPI_CPOL|0)
+SPI_MODE_3      = (SPI_CPOL|SPI_CPHA)
+
+# does not work
+# SPI_CS_HIGH     = 0x04
+# SPI_LSB_FIRST   = 0x08
+# SPI_3WIRE       = 0x10
+# SPI_LOOP        = 0x20
+# SPI_NO_CS       = 0x40
+# SPI_READY       = 0x80
+
+SPI_IOC_MAGIC   = ord('k')
+
+def SPI_IOC_MESSAGE(count):
+    return _IOW(SPI_IOC_MAGIC, 0, count)
+
+# Read / Write of SPI mode (SPI_MODE_0..SPI_MODE_3)
+SPI_IOC_RD_MODE             = _IOR(SPI_IOC_MAGIC, 1, 1)
+SPI_IOC_WR_MODE             = _IOW(SPI_IOC_MAGIC, 1, 1)
+
+# Read / Write SPI bit justification
+# does not work
+# SPI_IOC_RD_LSB_FIRST        = _IOR(SPI_IOC_MAGIC, 2, 1)
+# SPI_IOC_WR_LSB_FIRST        = _IOW(SPI_IOC_MAGIC, 2, 1)
+
+# Read / Write SPI device word length (1..N)
+SPI_IOC_RD_BITS_PER_WORD    = _IOR(SPI_IOC_MAGIC, 3, 1)
+SPI_IOC_WR_BITS_PER_WORD    = _IOW(SPI_IOC_MAGIC, 3, 1)
+
+# Read / Write SPI device default max speed hz
+SPI_IOC_RD_MAX_SPEED_HZ     = _IOR(SPI_IOC_MAGIC, 4, 4)
+SPI_IOC_WR_MAX_SPEED_HZ     = _IOW(SPI_IOC_MAGIC, 4, 4)
+
+class SPI(Bus):
+    def __init__(self, chip=0, mode=0, bits=8, speed=0):
+        Bus.__init__(self, "SPI", "/dev/spidev0.%d" % chip)
+        self.chip = chip
+
+        val8 = array.array('B', [0])
+        val8[0] = mode
+        if fcntl.ioctl(self.fd, SPI_IOC_WR_MODE, val8):
+            raise Exception("Cannot write SPI Mode")
+        if fcntl.ioctl(self.fd, SPI_IOC_RD_MODE, val8):
+            raise Exception("Cannot read SPI Mode")
+        self.mode = struct.unpack('B', val8)[0]
+        assert(self.mode == mode)
+
+        val8[0] = bits
+        if fcntl.ioctl(self.fd, SPI_IOC_WR_BITS_PER_WORD, val8):
+            raise Exception("Cannot write SPI Bits per word")
+        if fcntl.ioctl(self.fd, SPI_IOC_RD_BITS_PER_WORD, val8):
+            raise Exception("Cannot read SPI Bits per word")
+        self.bits = struct.unpack('B', val8)[0]
+        assert(self.bits == bits)
+
+        val32 = array.array('I', [0])
+        if speed > 0:
+            val32[0] = speed
+            if fcntl.ioctl(self.fd, SPI_IOC_WR_MAX_SPEED_HZ, val32):
+                raise Exception("Cannot write SPI Max speed")
+        if fcntl.ioctl(self.fd, SPI_IOC_RD_MAX_SPEED_HZ, val32):
+            raise Exception("Cannot read SPI Max speed")
+        self.speed = struct.unpack('I', val32)[0]
+        assert((self.speed == speed) or (speed == 0))
+    
+    def __str__(self):
+        return "SPI(chip=%d, mode=%d, speed=%dHz)" % (self.chip, self.mode, self.speed)
+        
+    def xfer(self, txbuff=None):
+        length = len(txbuff)
+        if PYTHON_MAJOR >= 3:
+            _txbuff = bytes(txbuff)
+            _txptr = ctypes.create_string_buffer(_txbuff)
+        else:
+            _txbuff = str(bytearray(txbuff))
+            _txptr = ctypes.create_string_buffer(_txbuff)
+        _rxptr = ctypes.create_string_buffer(length)
+        
+        data = struct.pack("QQLLHBBL",  #64 64 32 32 16 8 8 32 b = 32B
+                    ctypes.addressof(_txptr),
+                    ctypes.addressof(_rxptr),
+                    length,
+                    self.speed,
+                    0, #delay
+                    self.bits,
+                    0, # cs_change,
+                    0  # pad
+                    )
+        
+        fcntl.ioctl(self.fd, SPI_IOC_MESSAGE(len(data)), data)
+        _rxbuff = ctypes.string_at(_rxptr, length)
+        return bytearray(_rxbuff)
+        
\ No newline at end of file
diff --git a/python/webiopi/protocols/__init__.py b/python/webiopi/protocols/__init__.py
new file mode 100644
index 0000000..fc4ac9a
--- /dev/null
+++ b/python/webiopi/protocols/__init__.py
@@ -0,0 +1,14 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
diff --git a/python/webiopi/protocols/coap.py b/python/webiopi/protocols/coap.py
new file mode 100644
index 0000000..3ed6b3e
--- /dev/null
+++ b/python/webiopi/protocols/coap.py
@@ -0,0 +1,537 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from webiopi.utils.version import PYTHON_MAJOR
+from webiopi.utils.logger import info, exception 
+
+import socket
+import struct
+import logging
+import threading
+
+M_PLAIN = "text/plain"
+M_JSON  = "application/json"
+
+if PYTHON_MAJOR >= 3:
+    from urllib.parse import urlparse
+else:
+    from urlparse import urlparse
+
+try :
+    import _webiopi.GPIO as GPIO
+except:
+    pass
+
+def HTTPCode2CoAPCode(code):
+    return int(code/100) * 32 + (code%100)
+
+   
+class COAPContentFormat():
+    FORMATS = {0: "text/plain",
+               40: "application/link-format",
+               41: "application/xml",
+               42: "application/octet-stream",
+               47: "application/exi",
+               50: "application/json"
+               }
+
+    @staticmethod
+    def getCode(fmt):
+        if fmt == None:
+            return None
+        for code in COAPContentFormat.FORMATS:
+            if COAPContentFormat.FORMATS[code] == fmt:
+                return code
+        return None
+    
+    @staticmethod
+    def toString(code):
+        if code == None:
+            return None
+
+        if code in COAPContentFormat.FORMATS:
+            return COAPContentFormat.FORMATS[code]
+        
+        raise Exception("Unknown content format %d" % code)
+        
+
+class COAPOption():
+    OPTIONS = {1: "If-Match",
+               3: "Uri-Host",
+               4: "ETag",
+               5: "If-None-Match",
+               7: "Uri-Port",
+               8: "Location-Path",
+               11: "Uri-Path",
+               12: "Content-Format",
+               14: "Max-Age",
+               15: "Uri-Query",
+               16: "Accept",
+               20: "Location-Query",
+               35: "Proxy-Uri",
+               39: "Proxy-Scheme"
+               }
+    
+    IF_MATCH = 1
+    URI_HOST = 3
+    ETAG = 4
+    IF_NONE_MATCH = 5
+    URI_PORT = 7
+    LOCATION_PATH = 8
+    URI_PATH = 11
+    CONTENT_FORMAT = 12
+    MAX_AGE = 14
+    URI_QUERY = 15
+    ACCEPT = 16
+    LOCATION_QUERY = 20
+    PROXY_URI = 35
+    PROXY_SCHEME = 39
+    
+    
+class COAPMessage():
+    TYPES = ["CON", "NON", "ACK", "RST"]
+    CON = 0
+    NON = 1
+    ACK = 2
+    RST = 3
+
+    def __init__(self, msg_type=0, code=0, uri=None):
+        self.version = 1
+        self.type    = msg_type
+        self.code    = code
+        self.id      = 0
+        self.token   = None
+        self.options = []
+        self.host    = ""
+        self.port    = 5683
+        self.uri_path = ""
+        self.content_format = None
+        self.payload = None
+        
+        if uri != None:
+            p = urlparse(uri)
+            self.host = p.hostname
+            if p.port:
+                self.port = int(p.port)
+            self.uri_path = p.path
+        
+    def __getOptionHeader__(self, byte):
+        delta  = (byte & 0xF0) >> 4
+        length = byte & 0x0F
+        return (delta, length)  
+        
+    def __str__(self):
+        result = []
+        result.append("Version: %s" % self.version)
+        result.append("Type: %s" % self.TYPES[self.type])
+        result.append("Code: %s" % self.CODES[self.code])
+        result.append("Id: %s" % self.id)
+        result.append("Token: %s" % self.token)
+        #result.append("Options: %s" % len(self.options))
+        #for option in self.options:
+        #    result.append("+ %d: %s" % (option["number"], option["value"]))
+        result.append("Uri-Path: %s" % self.uri_path)
+        result.append("Content-Format: %s" % (COAPContentFormat.toString(self.content_format) if self.content_format else M_PLAIN))
+        result.append("Payload: %s" % self.payload)
+        result.append("")
+        return '\n'.join(result)
+        
+    def getOptionHeaderValue(self, value):
+        if value > 268:
+            return 14
+        if value > 12:
+            return 13
+        return value
+    
+    def getOptionHeaderExtension(self, value):
+        buff = bytearray()
+        v = self.getOptionHeaderValue(value)
+        
+        if v == 14:
+            value -= 269
+            buff.append((value & 0xFF00) >> 8)
+            buff.append(value & 0x00FF)
+
+        elif v == 13:
+            value -= 13
+            buff.append(value)
+
+        return buff
+    
+    def appendOption(self, buff, lastnumber, option, data):
+        delta = option - lastnumber
+        length = len(data)
+        
+        d = self.getOptionHeaderValue(delta)
+        l = self.getOptionHeaderValue(length)
+        
+        b  = 0
+        b |= (d << 4) & 0xF0  
+        b |= l & 0x0F
+        buff.append(b)
+        
+        ext = self.getOptionHeaderExtension(delta);
+        for b in ext:
+            buff.append(b)
+
+        ext = self.getOptionHeaderExtension(length);
+        for b in ext:
+            buff.append(b)
+
+        for b in data:
+            buff.append(b)
+
+        return option
+
+    def getBytes(self):
+        buff = bytearray()
+        byte  = (self.version & 0x03) << 6
+        byte |= (self.type & 0x03) << 4
+        if self.token:
+            token_len = min(len(self.token), 8);
+        else:
+            token_len = 0
+        byte |= token_len
+        buff.append(byte)
+        buff.append(self.code)
+        buff.append((self.id & 0xFF00) >> 8)
+        buff.append(self.id & 0x00FF)
+        
+        if self.token:
+            for c in self.token:
+                buff.append(c)
+
+        lastnumber = 0
+        
+        if len(self.uri_path) > 0:
+            paths = self.uri_path.split("/")
+            for p in paths:
+                if len(p) > 0:
+                    if PYTHON_MAJOR >= 3:
+                        data = p.encode()
+                    else:
+                        data = bytearray(p)
+                    lastnumber = self.appendOption(buff, lastnumber, COAPOption.URI_PATH, data)
+
+        if self.content_format != None:
+            data = bytearray()
+            fmt_code = self.content_format
+            if fmt_code > 0xFF:
+                data.append((fmt_code & 0xFF00) >> 8)
+            data.append(fmt_code & 0x00FF)
+            lastnumber = self.appendOption(buff, lastnumber, COAPOption.CONTENT_FORMAT, data)
+            
+        buff.append(0xFF)
+        
+        if self.payload:
+            if PYTHON_MAJOR >= 3:
+                data = self.payload.encode()
+            else:
+                data = bytearray(self.payload)
+            for c in data:
+                buff.append(c)
+        
+        return buff
+    
+    def parseByteArray(self, buff):
+        self.version = (buff[0] & 0xC0) >> 6
+        self.type    = (buff[0] & 0x30) >> 4
+        token_length = buff[0] & 0x0F
+        index = 4
+        if token_length > 0:
+            self.token = buff[index:index+token_length]
+
+        index += token_length
+        self.code    = buff[1]
+        self.id      = (buff[2] << 8) | buff[3]
+        
+        number = 0
+
+        # process options
+        while index < len(buff) and buff[index] != 0xFF:
+            (delta, length) = self.__getOptionHeader__(buff[index])
+            offset = 1
+
+            # delta extended with 1 byte
+            if delta == 13:
+                delta += buff[index+offset]
+                offset += 1
+            # delta extended with 2 buff
+            elif delta == 14:
+                delta += 255 + ((buff[index+offset] << 8) | buff[index+offset+1])
+                offset += 2
+            
+            # length extended with 1 byte
+            if length == 13:
+                length += buff[index+offset]
+                offset += 1
+                
+            # length extended with 2 buff
+            elif length == 14:
+                length += 255 + ((buff[index+offset] << 8) | buff[index+offset+1])
+                offset += 2
+
+            number += delta
+            valueBytes = buff[index+offset:index+offset+length]
+            # opaque option value
+            if number in [COAPOption.IF_MATCH, COAPOption.ETAG]:
+                value = valueBytes
+            # integer option value
+            elif number in [COAPOption.URI_PORT, COAPOption.CONTENT_FORMAT, COAPOption.MAX_AGE, COAPOption.ACCEPT]:
+                value = 0
+                for b in valueBytes:
+                    value <<= 8
+                    value |= b
+            # string option value
+            else:
+                if PYTHON_MAJOR >= 3:
+                    value = valueBytes.decode()
+                else:
+                    value = str(valueBytes)
+            self.options.append({'number': number, 'value': value})
+            index += offset + length
+
+        index += 1 # skip 0xFF / end-of-options
+        
+        if len(buff) > index:
+            self.payload = buff[index:]
+        else:
+            self.payload = ""
+        
+        for option in self.options:
+            (number, value) = option.values()
+            if number == COAPOption.URI_PATH:
+                self.uri_path += "/%s" % value
+
+
+class COAPRequest(COAPMessage):
+    CODES = {0: None,
+             1: "GET",
+             2: "POST",
+             3: "PUT",
+             4: "DELETE"
+             }
+
+    GET    = 1
+    POST   = 2
+    PUT    = 3
+    DELETE = 4
+
+    def __init__(self, msg_type=0, code=0, uri=None):
+        COAPMessage.__init__(self, msg_type, code, uri)
+
+class COAPGet(COAPRequest):
+    def __init__(self, uri):
+        COAPRequest.__init__(self, COAPMessage.CON, COAPRequest.GET, uri)
+
+class COAPPost(COAPRequest):
+    def __init__(self, uri):
+        COAPRequest.__init__(self, COAPMessage.CON, COAPRequest.POST, uri)
+
+class COAPPut(COAPRequest):
+    def __init__(self, uri):
+        COAPRequest.__init__(self, COAPMessage.CON, COAPRequest.PUT, uri)
+
+class COAPDelete(COAPRequest):
+    def __init__(self, uri):
+        COAPRequest.__init__(self, COAPMessage.CON, COAPRequest.DELETE, uri)
+
+class COAPResponse(COAPMessage):    
+    CODES = {0: None,
+             64: "2.00 OK",
+             65: "2.01 Created",
+             66: "2.02 Deleted",
+             67: "2.03 Valid",
+             68: "2.04 Changed",
+             69: "2.05 Content",
+             128: "4.00 Bad Request",
+             129: "4.01 Unauthorized",
+             130: "4.02 Bad Option",
+             131: "4.03 Forbidden",
+             132: "4.04 Not Found",
+             133: "4.05 Method Not Allowed",
+             134: "4.06 Not Acceptable",
+             140: "4.12 Precondition Failed",
+             141: "4.13 Request Entity Too Large",
+             143: "4.15 Unsupported Content-Format",
+             160: "5.00 Internal Server Error",
+             161: "5.01 Not Implemented",
+             162: "5.02 Bad Gateway",
+             163: "5.03 Service Unavailable",
+             164: "5.04 Gateway Timeout",
+             165: "5.05 Proxying Not Supported"            
+            }
+
+    # 2.XX
+    OK      = 64
+    CREATED = 65
+    DELETED = 66
+    VALID   = 67
+    CHANGED = 68
+    CONTENT = 69
+    
+    # 4.XX
+    BAD_REQUEST         = 128
+    UNAUTHORIZED        = 129
+    BAD_OPTION          = 130
+    FORBIDDEN           = 131
+    NOT_FOUND           = 132
+    NOT_ALLOWED         = 133
+    NOT_ACCEPTABLE      = 134
+    PRECONDITION_FAILED = 140
+    ENTITY_TOO_LARGE    = 141
+    UNSUPPORTED_CONTENT = 143
+    
+    # 5.XX
+    INTERNAL_ERROR          = 160
+    NOT_IMPLEMENTED         = 161
+    BAD_GATEWAY             = 162
+    SERVICE_UNAVAILABLE     = 163
+    GATEWAY_TIMEOUT         = 164
+    PROXYING_NOT_SUPPORTED  = 165
+    
+    def __init__(self):
+        COAPMessage.__init__(self)
+
+class COAPClient():
+    def __init__(self):
+        self.socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        self.socket.settimeout(1.0)
+        self.socket.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_TTL, 2)
+        
+    def sendRequest(self, message):
+        data = message.getBytes();
+        sent = 0
+        while sent<4:
+            try:
+                self.socket.sendto(data, (message.host, message.port))
+                data = self.socket.recv(1500)
+                response = COAPResponse()
+                response.parseByteArray(bytearray(data))
+                return response
+            except socket.timeout:
+                sent+=1
+        return None
+
+class COAPServer(threading.Thread):
+    logger = logging.getLogger("CoAP")
+
+    def __init__(self, host, port, handler):
+        threading.Thread.__init__(self, name="COAPThread")
+        self.handler = COAPHandler(handler)
+        self.host = host
+        self.port = port
+        self.multicast_ip = '224.0.1.123'
+        self.socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        self.socket.bind(('', port))
+        self.socket.settimeout(1)
+        self.running = True
+        self.start()
+        
+    def run(self):
+        info("CoAP Server binded on coap://%s:%s/" % (self.host, self.port))
+        while self.running == True:
+            try:
+                (request, client) = self.socket.recvfrom(1500)
+                requestBytes = bytearray(request)
+                coapRequest = COAPRequest()
+                coapRequest.parseByteArray(requestBytes)
+                coapResponse = COAPResponse()
+                #self.logger.debug("Received Request:\n%s" % coapRequest)
+                self.processMessage(coapRequest, coapResponse)
+                #self.logger.debug("Sending Response:\n%s" % coapResponse)
+                responseBytes = coapResponse.getBytes()
+                self.socket.sendto(responseBytes, client)
+                self.logger.debug('"%s %s CoAP/%.1f" %s -' % (coapRequest.CODES[coapRequest.code], coapRequest.uri_path, coapRequest.version, coapResponse.CODES[coapResponse.code]))
+                
+            except socket.timeout as e:
+                continue
+            except Exception as e:
+                if self.running == True:
+                    exception(e)
+            
+        info("CoAP Server stopped")
+    
+    def enableMulticast(self):
+        while not self.running:
+            pass
+        mreq = struct.pack("4sl", socket.inet_aton(self.multicast_ip), socket.INADDR_ANY)
+        self.socket.setsockopt(socket.IPPROTO_IP, socket.IP_ADD_MEMBERSHIP, mreq)
+        info("CoAP Server binded on coap://%s:%s/ (MULTICAST)" % (self.multicast_ip, self.port))
+                
+    def stop(self):
+        self.running = False
+        self.socket.close()
+        
+    def processMessage(self, request, response):
+        if request.type == COAPMessage.CON:
+            response.type = COAPMessage.ACK
+        else:
+            response.type = COAPMessage.NON
+
+        if request.token:
+            response.token = request.token
+
+        response.id = request.id
+        response.uri_path = request.uri_path
+        
+        if request.code == COAPRequest.GET:
+            self.handler.do_GET(request, response)
+        elif request.code == COAPRequest.POST:
+            self.handler.do_POST(request, response)
+        elif request.code / 32 == 0:
+            response.code = COAPResponse.NOT_IMPLEMENTED
+        else:
+            exception(Exception("Received CoAP Response : %s" % response))
+        
+class COAPHandler():
+    def __init__(self, handler):
+        self.handler = handler
+    
+    def do_GET(self, request, response):
+        try:
+            (code, body, contentType) = self.handler.do_GET(request.uri_path[1:], True)
+            if code == 0:
+                response.code = COAPResponse.NOT_FOUND
+            elif code == 200:
+                response.code = COAPResponse.CONTENT
+            else:
+                response.code =  HTTPCode2CoAPCode(code)
+            response.payload = body
+            response.content_format = COAPContentFormat.getCode(contentType)
+        except (GPIO.InvalidDirectionException, GPIO.InvalidChannelException, GPIO.SetupException) as e:
+            response.code = COAPResponse.FORBIDDEN
+            response.payload = "%s" % e
+        except Exception as e:
+            response.code = COAPResponse.INTERNAL_ERROR
+            raise e
+        
+    def do_POST(self, request, response):
+        try:
+            (code, body, contentType) = self.handler.do_POST(request.uri_path[1:], request.payload, True)
+            if code == 0:
+                response.code = COAPResponse.NOT_FOUND
+            elif code == 200:
+                response.code = COAPResponse.CHANGED
+            else:
+                response.code =  HTTPCode2CoAPCode(code)
+            response.payload = body
+            response.content_format = COAPContentFormat.getCode(contentType)
+        except (GPIO.InvalidDirectionException, GPIO.InvalidChannelException, GPIO.SetupException) as e:
+            response.code = COAPResponse.FORBIDDEN
+            response.payload = "%s" % e
+        except Exception as e:
+            response.code = COAPResponse.INTERNAL_ERROR
+            raise e
+        
diff --git a/python/webiopi/protocols/http.py b/python/webiopi/protocols/http.py
new file mode 100644
index 0000000..aea6d82
--- /dev/null
+++ b/python/webiopi/protocols/http.py
@@ -0,0 +1,249 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+import os
+import threading
+import codecs
+import mimetypes as mime
+import logging
+
+from webiopi.utils.version import VERSION_STRING, PYTHON_MAJOR
+from webiopi.utils.logger import info, exception
+from webiopi.utils.crypto import encrypt
+from webiopi.utils.types import str2bool
+
+if PYTHON_MAJOR >= 3:
+    import http.server as BaseHTTPServer
+else:
+    import BaseHTTPServer
+
+try :
+    import _webiopi.GPIO as GPIO
+except:
+    pass
+
+WEBIOPI_DOCROOT = "/usr/share/webiopi/htdocs"
+
+class HTTPServer(BaseHTTPServer.HTTPServer, threading.Thread):
+    def __init__(self, host, port, handler, context, docroot, index, auth=None):
+        BaseHTTPServer.HTTPServer.__init__(self, ("", port), HTTPHandler)
+        threading.Thread.__init__(self, name="HTTPThread")
+        self.host = host
+        self.port = port
+
+        if context:
+            self.context = context
+            if not self.context.startswith("/"):
+                self.context = "/" + self.context
+            if not self.context.endswith("/"):
+                self.context += "/"
+        else:
+            self.context = "/"
+
+        self.docroot = docroot
+
+        if index:
+            self.index = index
+        else:
+            self.index = "index.html"
+            
+        self.handler = handler
+        self.auth = auth
+
+        self.running = True
+        self.start()
+            
+    def get_request(self):
+        sock, addr = self.socket.accept()
+        sock.settimeout(10.0)
+        return (sock, addr)
+
+    def run(self):
+        info("HTTP Server binded on http://%s:%s%s" % (self.host, self.port, self.context))
+        try:
+            self.serve_forever()
+        except Exception as e:
+            if self.running == True:
+                exception(e)
+        info("HTTP Server stopped")
+
+    def stop(self):
+        self.running = False
+        self.server_close()
+
+class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
+    logger = logging.getLogger("HTTP")
+
+    def log_message(self, fmt, *args):
+        self.logger.debug(fmt % args)
+    
+    def log_error(self, fmt, *args):
+        pass
+        
+    def version_string(self):
+        return VERSION_STRING
+    
+    def checkAuthentication(self):
+        if self.server.auth == None or len(self.server.auth) == 0:
+            return True
+        
+        authHeader = self.headers.get('Authorization')
+        if authHeader == None:
+            return False
+        
+        if not authHeader.startswith("Basic "):
+            return False
+        
+        auth = authHeader.replace("Basic ", "")
+        if PYTHON_MAJOR >= 3:
+            auth_hash = encrypt(auth.encode())
+        else:
+            auth_hash = encrypt(auth)
+            
+        if auth_hash == self.server.auth:
+            return True
+        return False
+
+    def requestAuthentication(self):
+        self.send_response(401)
+        self.send_header("WWW-Authenticate", 'Basic realm="webiopi"')
+        self.end_headers();
+    
+    def sendResponse(self, code, body=None, contentType="text/plain"):
+        if code >= 400:
+            if body != None:
+                self.send_error(code, body)
+            else:
+                self.send_error(code)
+        else:
+            self.send_response(code)
+            self.send_header("Cache-Control", "no-cache")
+            if body != None:
+                self.send_header("Content-Type", contentType);
+                self.end_headers();
+                self.wfile.write(body.encode())
+                
+    def findFile(self, filepath):
+        if os.path.exists(filepath):
+            if os.path.isdir(filepath):
+                filepath += "/" + self.server.index
+                if os.path.exists(filepath):
+                    return filepath
+            else:
+                return filepath
+        return None
+        
+                
+    def serveFile(self, relativePath):
+        if self.server.docroot != None:
+            path = self.findFile(self.server.docroot + "/" + relativePath)
+            if path == None:
+                path = self.findFile("./" + relativePath)
+
+        else:
+            path = self.findFile("./" + relativePath)                
+            if path == None:
+                path = self.findFile(WEBIOPI_DOCROOT + "/" + relativePath)
+
+        if path == None and (relativePath.startswith("webiopi.") or relativePath.startswith("jquery")):
+            path = self.findFile(WEBIOPI_DOCROOT + "/" + relativePath)
+
+        if path == None:
+            return self.sendResponse(404, "Not Found")
+
+        realPath = os.path.realpath(path)
+        
+        if realPath.endswith(".py"):
+            return self.sendResponse(403, "Not Authorized")
+        
+        if not (realPath.startswith(os.getcwd()) 
+                or (self.server.docroot and realPath.startswith(self.server.docroot))
+                or realPath.startswith(WEBIOPI_DOCROOT)):
+            return self.sendResponse(403, "Not Authorized")
+        
+        (contentType, encoding) = mime.guess_type(path)
+        f = codecs.open(path, encoding=encoding)
+        data = f.read()
+        f.close()
+        self.send_response(200)
+        self.send_header("Content-Type", contentType);
+        self.send_header("Content-Length", os.path.getsize(realPath))
+        self.end_headers()
+        self.wfile.write(data)
+        
+    def processRequest(self):
+        self.request.settimeout(None)
+        if not self.checkAuthentication():
+            return self.requestAuthentication()
+        
+        request = self.path.replace(self.server.context, "/").split('?')
+        relativePath = request[0]
+        if relativePath[0] == "/":
+            relativePath = relativePath[1:]
+            
+        if relativePath == "webiopi" or relativePath == "webiopi/":
+            self.send_response(301)
+            self.send_header("Location", "/")
+            self.end_headers()
+            return
+
+        params = {}
+        if len(request) > 1:
+            for s in request[1].split('&'):
+                if s.find('=') > 0:
+                    (name, value) = s.split('=')
+                    params[name] = value
+                else:
+                    params[s] = None
+        
+        compact = False
+        if 'compact' in params:
+            compact = str2bool(params['compact'])
+
+        try:
+            result = (None, None, None)
+            if self.command == "GET":
+                result = self.server.handler.do_GET(relativePath, compact)
+            elif self.command == "POST":
+                length = 0
+                length_header = 'content-length'
+                if length_header in self.headers:
+                    length = int(self.headers[length_header])
+                result = self.server.handler.do_POST(relativePath, self.rfile.read(length), compact)
+            else:
+                result = (405, None, None)
+                
+            (code, body, contentType) = result
+            
+            if code > 0:
+                self.sendResponse(code, body, contentType)
+            else:
+                if self.command == "GET":
+                    self.serveFile(relativePath)
+                else:
+                    self.sendResponse(404)
+
+        except (GPIO.InvalidDirectionException, GPIO.InvalidChannelException, GPIO.SetupException) as e:
+            self.sendResponse(403, "%s" % e)
+        except ValueError as e:
+            self.sendResponse(403, "%s" % e)
+        except Exception as e:
+            self.sendResponse(500)
+            raise e
+            
+    def do_GET(self):
+        self.processRequest()
+
+    def do_POST(self):
+        self.processRequest()
diff --git a/python/webiopi/protocols/rest.py b/python/webiopi/protocols/rest.py
new file mode 100644
index 0000000..6010604
--- /dev/null
+++ b/python/webiopi/protocols/rest.py
@@ -0,0 +1,254 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from webiopi.utils import types
+from webiopi.utils import logger
+from webiopi.utils.types import M_JSON, M_PLAIN
+from webiopi.utils.version import BOARD_REVISION, VERSION_STRING, MAPPING
+from webiopi.devices import manager
+from webiopi.devices import instance
+from webiopi.devices.bus import BUSLIST
+
+try:
+    import _webiopi.GPIO as GPIO
+except:
+    pass
+
+MACROS = {}
+
+class RESTHandler():
+    def __init__(self):
+        self.device_mapping = True
+        self.export = []
+        self.routes = {}
+        self.macros = {}
+        
+
+    def addMacro(self, macro):
+        self.macros[macro.__name__] = macro
+        
+    def addRoute(self, source, destination):
+        if source[0] == "/":
+            source = source[1:]
+        if destination[0] == "/":
+            destination = destination[1:]
+        self.routes[source] = destination
+        logger.info("Added Route /%s => /%s" % (source, destination))
+        
+    def findRoute(self, path):
+        for source in self.routes:
+            if path.startswith(source):
+                route = path.replace(source, self.routes[source])
+                logger.info("Routing /%s => /%s" % (path, route))
+                return route
+        return path
+        
+    def extract(self, fmtArray, pathArray, args):
+        if len(fmtArray) != len(pathArray):
+            return False
+        if len(fmtArray) == 0:
+            return True
+        fmt = fmtArray[0]
+        path = pathArray[0]
+        if fmt == path:
+            return self.extract(fmtArray[1:], pathArray[1:], args)
+        if fmt.startswith("%"):
+            
+            fmt = fmt[1:]
+            t = 's'
+            if fmt[0] == '(':
+                if fmt[-1] == ')':
+                    name = fmt[1:-1]
+                elif fmt[-2] == ')':                                   
+                    name = fmt[1:-2]
+                    t = fmt[-1]
+                else:
+                    raise Exception("Missing closing brace")
+            else:
+                name = fmt
+            
+            if t == 's':
+                args[name] = path
+            elif t == 'b':
+                args[name] = types.str2bool(path)
+            elif t == 'd':
+                args[name] = types.toint(path)
+            elif t == 'x':
+                args[name] = int(path, 16)
+            elif t == 'f':
+                args[name] = float(path)
+            else:
+                raise Exception("Unknown format type : %s" % t)
+            
+            return self.extract(fmtArray[1:], pathArray[1:], args)
+            
+        return False
+
+    def getDeviceRoute(self, method, path):
+        pathArray = path.split("/")
+        deviceName = pathArray[0]
+        device = instance.DEVICES[deviceName]
+        if device == None:
+            return (None, deviceName + " Not Found")
+        pathArray = pathArray[1:]
+        funcs = device["functions"][method]
+        functionName = "/".join(pathArray)
+        if functionName in funcs:
+            return (funcs[functionName], {})
+        
+        for fname in funcs:
+            func = funcs[fname]
+            funcPathArray = func.path.split("/")
+            args = {}
+            if self.extract(funcPathArray, pathArray, args):
+                return (func, args) 
+        
+        return (None, functionName + " Not Found")
+    
+    def callDeviceFunction(self, method, path, data=None):
+        (func, args) = self.getDeviceRoute(method, path)
+        if func == None:
+            return (404, args, M_PLAIN)
+
+        if func.data != None:
+            args[func.data] = data
+        
+        result = func(**args)
+        response = None
+        contentType = None
+        if result != None:
+            if hasattr(func, "contentType"):
+                contentType = func.contentType
+                if contentType == M_JSON:
+                    response = types.jsonDumps(result)
+                else:
+                    response = func.format % result
+            else:
+                response = result
+        
+        return (200, response, contentType)
+        
+    def do_GET(self, relativePath, compact=False):
+        relativePath = self.findRoute(relativePath)
+        
+        # JSON full state
+        if relativePath == "*":
+            return (200, self.getJSON(compact), M_JSON)
+            
+        # RPi header map
+        elif relativePath == "map":
+            json = "%s" % MAPPING
+            json = json.replace("'", '"')
+            return (200, json, M_JSON)
+
+        # server version
+        elif relativePath == "version":
+            return (200, VERSION_STRING, M_PLAIN)
+
+        # board revision
+        elif relativePath == "revision":
+            revision = "%s" % BOARD_REVISION
+            return (200, revision, M_PLAIN)
+
+        # Single GPIO getter
+        elif relativePath.startswith("GPIO/"):
+            return self.callDeviceFunction("GET", relativePath)
+        
+        elif relativePath == "devices/*":
+            return (200, manager.getDevicesJSON(compact), M_JSON)
+        
+        elif relativePath.startswith("devices/"):
+            if not self.device_mapping:
+                return (404, None, None)
+            path = relativePath.replace("devices/", "")
+            return self.callDeviceFunction("GET", path)
+
+        else:
+            return (0, None, None)
+
+    def do_POST(self, relativePath, data, compact=False):
+        relativePath = self.findRoute(relativePath)
+
+        if relativePath.startswith("GPIO/"):
+            return self.callDeviceFunction("POST", relativePath)
+                
+        elif relativePath.startswith("macros/"):
+            paths = relativePath.split("/")
+            mname = paths[1]
+            if len(paths) > 2:
+                value = paths[2]
+            else:
+                value = ""
+
+            if mname in self.macros:
+                macro = self.macros[mname]
+
+                if ',' in value:
+                    args = value.split(',')
+                    result = macro(*args)
+                elif len(value) > 0:
+                    result = macro(value)
+                else:
+                    result = macro()
+                     
+                response = ""
+                if result:
+                    response = "%s" % result
+                return (200, response, M_PLAIN)
+                    
+            else:
+                return (404, mname + " Not Found", M_PLAIN)
+                
+        elif relativePath.startswith("devices/"):
+            if not self.device_mapping:
+                return (404, None, None)
+            path = relativePath.replace("devices/", "")
+            return self.callDeviceFunction("POST", path, data)
+
+        else: # path unknowns
+            return (0, None, None)
+
+    def getJSON(self, compact=False):
+        if compact:
+            f = 'f'
+            v = 'v'
+        else:
+            f = 'function'
+            v = 'value'
+        
+        json = {}
+        for (bus, value) in BUSLIST.items():
+            json[bus] = int(value["enabled"])
+        
+        gpios = {}
+        if len(self.export) > 0:
+            export = self.export
+        else:
+            export = range(GPIO.GPIO_COUNT)
+    
+        for gpio in export:
+            gpios[gpio] = {}
+            if compact:
+                gpios[gpio][f] = GPIO.getFunction(gpio)
+            else:
+                gpios[gpio][f] = GPIO.getFunctionString(gpio)
+            gpios[gpio][v] = int(GPIO.input(gpio))
+    
+            if GPIO.getFunction(gpio) == GPIO.PWM:
+                (pwmType, value) = GPIO.getPulse(gpio).split(':')
+                gpios[gpio][pwmType] = value
+        
+        json['GPIO'] = gpios
+        return types.jsonDumps(json)
+
diff --git a/python/webiopi/server/__init__.py b/python/webiopi/server/__init__.py
new file mode 100644
index 0000000..68fdbe6
--- /dev/null
+++ b/python/webiopi/server/__init__.py
@@ -0,0 +1,139 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+import os
+import time
+import socket
+
+from webiopi.utils.config import Config
+from webiopi.utils import loader
+from webiopi.utils import logger
+from webiopi.utils import crypto
+from webiopi.devices import manager
+from webiopi.protocols import rest
+from webiopi.protocols import http
+from webiopi.protocols import coap
+from webiopi.devices.digital.gpio import NativeGPIO
+
+def getLocalIP():
+        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        try:
+            s.connect(('8.8.8.8', 53))
+            host = s.getsockname()[0]
+            s.close()
+            return host 
+        except:
+            return "localhost"
+
+class Server():
+    def __init__(self, port=8000, coap_port=5683, login=None, password=None, passwdfile=None, configfile=None):
+        self.host = getLocalIP()
+        self.gpio = NativeGPIO()
+        self.restHandler = rest.RESTHandler()
+        manager.addDeviceInstance("GPIO", self.gpio, [])
+
+        if configfile != None:
+            logger.info("Loading configuration from %s" % configfile)
+            config = Config(configfile)
+        else:
+            config = Config()
+            
+        self.gpio.addSetups(config.items("GPIO"))
+        self.gpio.addResets(config.items("~GPIO"))
+        self.gpio.setup()
+        
+        devices = config.items("DEVICES")
+        for (name, params) in devices:
+            values = params.split(" ")
+            driver = values[0];
+            args = {}
+            i = 1
+            while i < len(values):
+                (arg, val) = values[i].split(":")
+                args[arg] = val
+                i+=1
+            manager.addDevice(name, driver, args)
+                
+        scripts = config.items("SCRIPTS")
+        for (name, source) in scripts:
+            loader.loadScript(name, source, self.restHandler)
+        
+        self.restHandler.device_mapping = config.getboolean("REST", "device-mapping", True)
+        self.gpio.post_value = config.getboolean("REST", "gpio-post-value", True)
+        self.gpio.post_function = config.getboolean("REST", "gpio-post-function", True)
+        exports = config.get("REST", "gpio-export", None)
+        if exports != None:
+            self.gpio.export = [int(s) for s in exports.split(",")]
+        self.restHandler.export = self.gpio.export
+        
+        http_port = config.getint("HTTP", "port", port)
+        http_enabled = config.getboolean("HTTP", "enabled", http_port > 0)
+        http_passwdfile = config.get("HTTP", "passwd-file", passwdfile)
+        context = config.get("HTTP", "context", None)
+        docroot = config.get("HTTP", "doc-root", None)
+        index = config.get("HTTP", "welcome-file", None)
+            
+        coap_port = config.getint("COAP", "port", coap_port)
+        coap_enabled = config.getboolean("COAP", "enabled", coap_port > 0)
+        coap_multicast = config.getboolean("COAP", "multicast", coap_enabled)
+
+        routes = config.items("ROUTES")
+        for (source, destination) in routes:
+            self.restHandler.addRoute(source, destination)
+    
+        auth = None
+        if http_passwdfile != None:
+            if os.path.exists(http_passwdfile):
+                f = open(http_passwdfile)
+                auth = f.read().strip(" \r\n")
+                f.close()
+                if len(auth) > 0:
+                    logger.info("Access protected using %s" % http_passwdfile)
+                else:
+                    logger.info("Passwd file %s is empty" % http_passwdfile)
+            else:
+                logger.error("Passwd file %s not found" % http_passwdfile)
+            
+        elif login != None or password != None:
+            auth = crypto.encryptCredentials(login, password)
+            logger.info("Access protected using login/password")
+            
+        if auth == None or len(auth) == 0:
+            logger.warn("Access unprotected")
+        
+        if http_enabled:
+            self.http_server = http.HTTPServer(self.host, http_port, self.restHandler, context, docroot, index, auth)
+        else:
+            self.http_server = None
+        
+        if coap_enabled:
+            self.coap_server = coap.COAPServer(self.host, coap_port, self.restHandler)
+            if coap_multicast:
+                self.coap_server.enableMulticast()
+        else:
+            self.coap_server = None
+    
+    def addMacro(self, macro):
+        self.restHandler.addMacro(macro)
+        
+    def stop(self):
+        if self.http_server:
+            self.http_server.stop()
+        if self.coap_server:
+            self.coap_server.stop()
+        loader.unloadScripts()
+        manager.closeDevices()
+
+
+
diff --git a/python/webiopi/utils/__init__.py b/python/webiopi/utils/__init__.py
new file mode 100644
index 0000000..ad86c93
--- /dev/null
+++ b/python/webiopi/utils/__init__.py
@@ -0,0 +1,16 @@
+#   Copyright 2012-2013 Eric Ptak - trouch.com
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+
+
diff --git a/python/webiopi/utils/config.py b/python/webiopi/utils/config.py
new file mode 100644
index 0000000..72302e5
--- /dev/null
+++ b/python/webiopi/utils/config.py
@@ -0,0 +1,35 @@
+from webiopi.utils.version import PYTHON_MAJOR
+
+if PYTHON_MAJOR >= 3:
+    import configparser as parser
+else:
+    import ConfigParser as parser
+
+class Config():
+    
+    def __init__(self, configfile=None):
+        config = parser.ConfigParser()
+        config.optionxform = str
+        if configfile != None:
+            config.read(configfile)
+        self.config = config
+
+    def get(self, section, key, default):
+        if self.config.has_option(section, key):
+            return self.config.get(section, key)
+        return default
+
+    def getboolean(self, section, key, default):
+        if self.config.has_option(section, key):
+            return self.config.getboolean(section, key)
+        return default
+    
+    def getint(self, section, key, default):
+        if self.config.has_option(section, key):
+            return self.config.getint(section, key)
+        return default
+    
+    def items(self, section):
+        if self.config.has_section(section):
+            return self.config.items(section)
+        return {}
diff --git a/python/webiopi/utils/crypto.py b/python/webiopi/utils/crypto.py
new file mode 100644
index 0000000..aa48a82
--- /dev/null
+++ b/python/webiopi/utils/crypto.py
@@ -0,0 +1,17 @@
+import base64
+import hashlib
+from webiopi.utils.version import PYTHON_MAJOR
+
+def encodeCredentials(login, password):
+    abcd = "%s:%s" % (login, password)
+    if PYTHON_MAJOR >= 3:
+        b = base64.b64encode(abcd.encode())
+    else:
+        b = base64.b64encode(abcd)
+    return b
+
+def encrypt(value):
+    return hashlib.sha256(value).hexdigest()
+
+def encryptCredentials(login, password):
+    return encrypt(encodeCredentials(login, password))
diff --git a/python/webiopi/utils/loader.py b/python/webiopi/utils/loader.py
new file mode 100644
index 0000000..bf7c693
--- /dev/null
+++ b/python/webiopi/utils/loader.py
@@ -0,0 +1,26 @@
+import imp
+import webiopi.utils.logger as logger
+import webiopi.utils.thread as thread
+SCRIPTS = {}
+
+def loadScript(name, source, handler = None):
+    logger.info("Loading %s from %s" % (name, source))
+    script = imp.load_source(name, source)
+    SCRIPTS[name] = script
+
+    if hasattr(script, "setup"):
+        script.setup()
+    if handler:
+        for aname in dir(script):
+            attr = getattr(script, aname)
+            if callable(attr) and hasattr(attr, "macro"):
+                handler.addMacro(attr)
+    if hasattr(script, "loop"):
+        thread.runLoop(script.loop, True)
+
+def unloadScripts():
+    for name in SCRIPTS:
+        script = SCRIPTS[name]
+        if hasattr(script, "destroy"):
+            script.destroy()
+    
\ No newline at end of file
diff --git a/python/webiopi/utils/logger.py b/python/webiopi/utils/logger.py
new file mode 100644
index 0000000..fb92ec5
--- /dev/null
+++ b/python/webiopi/utils/logger.py
@@ -0,0 +1,45 @@
+import logging
+
+LOG_FORMATTER = logging.Formatter(fmt='%(asctime)s - %(name)s - %(levelname)s - %(message)s', datefmt="%Y-%m-%d %H:%M:%S")        
+ROOT_LOGGER = logging.getLogger()
+ROOT_LOGGER.setLevel(logging.WARN)
+
+CONSOLE_HANDLER = logging.StreamHandler()
+CONSOLE_HANDLER.setFormatter(LOG_FORMATTER)
+ROOT_LOGGER.addHandler(CONSOLE_HANDLER)
+
+LOGGER = logging.getLogger("WebIOPi")
+
+def setInfo():
+    ROOT_LOGGER.setLevel(logging.INFO)
+
+def setDebug():
+    ROOT_LOGGER.setLevel(logging.DEBUG)
+    
+def debugEnabled():
+    return ROOT_LOGGER.level == logging.DEBUG
+
+def logToFile(filename):
+    FILE_HANDLER = logging.FileHandler(filename)
+    FILE_HANDLER.setFormatter(LOG_FORMATTER)
+    ROOT_LOGGER.addHandler(FILE_HANDLER)
+
+def debug(message):
+    LOGGER.debug(message)
+
+def info(message):
+    LOGGER.info(message)
+
+def warn(message):
+    LOGGER.warn(message)
+
+def error(message):
+    LOGGER.error(message)
+
+def exception(message):
+    LOGGER.exception(message)
+
+def printBytes(buff):
+    for i in range(0, len(buff)):
+        print("%03d: 0x%02X %03d %c" % (i, buff[i], buff[i], buff[i]))
+        
diff --git a/python/webiopi/utils/thread.py b/python/webiopi/utils/thread.py
new file mode 100644
index 0000000..98ed752
--- /dev/null
+++ b/python/webiopi/utils/thread.py
@@ -0,0 +1,50 @@
+import time
+import signal
+import threading
+from webiopi.utils import logger
+
+RUNNING = False
+TASKS = []
+
+class Task(threading.Thread):
+    def __init__(self, func, loop=False):
+        threading.Thread.__init__(self)
+        self.func = func
+        self.loop = loop
+        self.running = True
+        self.start()
+    
+    def stop(self):
+        self.running = False
+
+    def run(self):
+        if self.loop:
+            while self.running == True:
+                self.func()
+        else:
+            self.func()
+
+def stop(signum=0, frame=None):
+    global RUNNING
+    if RUNNING:
+        logger.info("Stopping...")
+        RUNNING = False
+        for task in TASKS:
+            task.stop()
+                
+
+def runLoop(func=None, async=False):
+    global RUNNING
+    RUNNING = True
+    signal.signal(signal.SIGINT, stop)
+    signal.signal(signal.SIGTERM, stop)
+
+    if func != None:
+        if async:
+            TASKS.append(Task(func, True))
+        else:
+            while RUNNING:
+                func()
+    else:
+        while RUNNING:
+            time.sleep(1)
diff --git a/python/webiopi/utils/types.py b/python/webiopi/utils/types.py
new file mode 100644
index 0000000..0afaa20
--- /dev/null
+++ b/python/webiopi/utils/types.py
@@ -0,0 +1,30 @@
+import json
+from webiopi.utils import logger
+
+M_PLAIN = "text/plain"
+M_JSON  = "application/json"
+
+def jsonDumps(obj):
+    if logger.debugEnabled():
+        return json.dumps(obj, sort_keys=True, indent=4, separators=(',', ': '))
+    else:
+        return json.dumps(obj)
+    
+def str2bool(value):
+    return (value == "1") or (value == "true") or (value == "True") or (value == "yes") or (value == "Yes")
+
+def toint(value):
+    if isinstance(value, str):
+        if value.startswith("0b"):
+            return int(value, 2)
+        elif value.startswith("0x"):
+            return int(value, 16)
+        else:
+            return int(value)
+    return value
+
+        
+def signInteger(value, bitcount):
+    if value & (1<<(bitcount-1)):
+        return value - (1<<bitcount)
+    return value
diff --git a/python/webiopi/utils/version.py b/python/webiopi/utils/version.py
new file mode 100644
index 0000000..b5e32de
--- /dev/null
+++ b/python/webiopi/utils/version.py
@@ -0,0 +1,29 @@
+import re
+import sys
+
+VERSION         = '0.6.2'
+VERSION_STRING  = "WebIOPi/%s/Python%d.%d" % (VERSION, sys.version_info.major, sys.version_info.minor)
+PYTHON_MAJOR    = sys.version_info.major
+BOARD_REVISION  = 0
+
+_MAPPING = [[], [], []]
+_MAPPING[1] = ["V33", "V50", 0, "V50", 1, "GND", 4, 14, "GND", 15, 17, 18, 21, "GND", 22, 23, "V33", 24, 10, "GND", 9, 25, 11, 8, "GND", 7]
+_MAPPING[2] = ["V33", "V50", 2, "V50", 3, "GND", 4, 14, "GND", 15, 17, 18, 27, "GND", 22, 23, "V33", 24, 10, "GND", 9, 25, 11, 8, "GND", 7]
+
+
+try:
+    with open("/proc/cpuinfo") as f:
+        rc = re.compile("Revision\s*:\s(.*)\n")
+        info = f.read()
+        result = rc.search(info)
+        if result != None:
+            hex_cpurev = result.group(1)
+            if hex_cpurev.startswith("1000"):
+                hex_cpurev = hex_cpurev[-4:]
+            cpurev = int(hex_cpurev, 16)
+            BOARD_REVISION = 1 if (cpurev < 4) else 2
+        
+except:
+    pass
+
+MAPPING = _MAPPING[BOARD_REVISION]
diff --git a/setup.sh b/setup.sh
new file mode 100755
index 0000000..865c6fe
--- /dev/null
+++ b/setup.sh
@@ -0,0 +1,126 @@
+#!/bin/sh
+# WebIOPi setup script
+
+SEARCH="python python3"
+FOUND=""
+INSTALLED=""
+
+if [ "$#" = "1" ]; then
+        command="$1"
+else
+        command="none"
+fi
+
+echo
+echo "Installing WebIOPi..."
+echo
+
+if [ "$command" != "skip-apt" ]; then
+        echo "Updating apt package list..."
+        apt-get update
+        echo
+fi
+
+# Install Python library
+cd python
+
+# Look up for installed python
+for python in $SEARCH; do
+        program="/usr/bin/$python"
+        if [ -x $program ]; then
+                FOUND="$FOUND $python"
+                version=`$python -V 2>&1`
+                include=`$python -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())"`
+                echo "Found $version... "
+
+                if [ "$command" != "skip-apt" ]; then
+                        # Install required dev header and setuptools
+                        echo "Trying to install $python-dev using apt-get"
+                        apt-get install -y $python-dev $python-setuptools
+                fi
+
+                # Try to compile and install for the current python
+                if [ -f "$include/Python.h" ]; then
+                        echo "Trying to install WebIOPi for $version"
+                        $python setup.py install
+                        if [ "$?" -ne "0" ]; then
+                                # Sub setup error, continue with next python
+                                echo "Build for $version failed\n"
+                                continue
+                        fi
+                        echo "WebIOPi installed for $version\n"
+                        INSTALLED="$INSTALLED $python"
+                else
+                        echo "Cannot install for $version : missing development headers\n"
+                fi
+        fi
+done
+
+# Go back to the root folder
+cd ..
+
+# Ensure WebIOPi is installed to continue
+if [ -z "$INSTALLED" ]; then
+        if [ -z "$FOUND" ]; then
+                echo "ERROR: WebIOPi cannot be installed - neither python or python3 found"
+                exit 1
+        else
+                echo "ERROR: WebIOPi cannot be installed - please check errors above"
+                exit 2
+        fi
+fi
+
+# Select greater python version
+for python in $INSTALLED; do
+        echo $python > /dev/null
+done
+
+# Update HTML resources
+echo "Copying HTML resources..."
+mkdir /usr/share/webiopi 2>/dev/null 1>/dev/null
+cp -rfv htdocs /usr/share/webiopi
+echo
+
+# Add config file if it does not exist
+if [ ! -f "/etc/webiopi/config" ]; then
+        echo "Copying default config file..."
+        mkdir /etc/webiopi 2>/dev/null 1>/dev/null
+        cp -v python/config /etc/webiopi/config
+fi
+
+# Add passwd file if it does not exist
+if [ ! -f "/etc/webiopi/passwd" ]; then
+        echo "Copying default passwd file..."
+        mkdir /etc/webiopi 2>/dev/null 1>/dev/null
+        cp -v python/passwd /etc/webiopi/passwd
+fi
+
+# Add service/daemon script
+#if [ ! -f "/etc/init.d/webiopi" ]; then
+echo "Installing startup script..."
+cp -rf python/webiopi.init.sh /etc/init.d/webiopi
+sed -i "s/python/$python/g" /etc/init.d/webiopi
+chmod 0755 /etc/init.d/webiopi
+
+# Add webiopi command
+echo "Installing webiopi command..."
+cp -rf python/webiopi.sh /usr/bin/webiopi
+sed -i "s/python/$python/g" /usr/bin/webiopi
+chmod 0755 /usr/bin/webiopi
+
+# Add webiopi-passwd command
+echo "Installing webiopi-passwd command..."
+cp -rf python/webiopi-passwd.py /usr/bin/webiopi-passwd
+sed -i "s/python/$python/g" /usr/bin/webiopi-passwd
+chmod 0755 /usr/bin/webiopi-passwd
+
+# Display WebIOPi usages
+echo
+echo "WebIOPi successfully installed"
+echo "* To start WebIOPi foreground\t: sudo webiopi [-h] [-c config] [-l log] [-s script] [-d] [port]"
+echo
+echo "* To start WebIOPi background\t: sudo /etc/init.d/webiopi start"
+echo "* To start WebIOPi at boot\t: sudo update-rc.d webiopi defaults"
+echo
+echo "* Look in `pwd`/examples for Python library usage examples"
+echo