Merge branch 'master' of https://github.com/dashee-bot/dashee
Merge branch 'master' of https://github.com/dashee-bot/dashee
Merge branch 'testing'
Merge branch 'testing'
Merge branch 'testing'
Merge branch 'testing'
Removing root folders
Moved the www folder to root
Merge branch 'master' into testing

Conflicts:
	makefile.common
	playground/makefile
	playground/src/9DOF-ADXL345.py
	server/files/examples/servod.conf
	server/include/dashee/Exception.h
	server/include/dashee/Hardware/Accelerometer.h
	server/include/dashee/Hardware/Accelerometer/Dummy.h
	server/include/dashee/Hardware/Exception/Servo.h
	server/include/dashee/Hardware/Exception/ServoController.h
	server/include/dashee/Hardware/Servo.h
	server/include/dashee/Hardware/Servo/Dummy.h
	server/include/dashee/Hardware/Servo/UART.h
	server/include/dashee/Hardware/ServoController.h
	server/include/dashee/Hardware/ServoController/Dummy.h
	server/include/dashee/Hardware/ServoController/UART.h
	server/include/dashee/Hardware/ServoController/USB.h
	server/include/dashee/I2C.h
	server/include/dashee/Server.h
	server/include/dashee/Vehicle.h
	server/include/dashee/Vehicle/Car.h
	server/include/dashee/Vehicle/Multirotor.h
	server/include/dashee/Vehicle/Multirotor/Quad.h
	server/include/dashee/Vehicle/Multirotor/Quad/X.h
	server/include/dashee/common.h
	server/include/dashee/common.tpp
	server/makefile
	server/scripts/runtest.sh
	server/src/Config.cpp
	server/src/GPIO.cpp
	server/src/Hardware/Accelerometer.cpp
	server/src/Hardware/Accelerometer/Dummy.cpp
	server/src/Hardware/Servo/Dummy.cpp
	server/src/Hardware/Servo/UART.cpp
	server/src/Hardware/ServoController.cpp
	server/src/Hardware/ServoController/Dummy.cpp
	server/src/Hardware/ServoController/UART.cpp
	server/src/I2C.cpp
	server/src/Server.cpp
	server/src/Server/UDP.cpp
	server/src/Vehicle.cpp
	server/src/Vehicle/Car.cpp
	server/src/Vehicle/Multirotor.cpp
	server/src/Vehicle/Multirotor/Quad.cpp
	server/src/Vehicle/Multirotor/Quad/X.cpp
	server/src/common.cpp
	server/src/daemon.cpp
	server/src/servod.cpp
	server/src/servod/Container.cpp
	server/src/servod/Container.h
	server/src/servod/signals.cpp
	server/src/servod/signals.h
	server/src/servod/threads.cpp
	server/src/servod/threads.h
	server/tests/Hardware/Accelerometer.cpp
	server/tests/Hardware/Accelerometer.h
	server/tests/Hardware/Accelerometer/Dummy.cpp
	server/tests/Hardware/Accelerometer/Dummy.h
	server/tests/Hardware/Servo.h
	server/tests/Hardware/Servo/Dummy.cpp
	server/tests/Hardware/Servo/Dummy.h
	server/tests/Hardware/Servo/UART.cpp
	server/tests/Hardware/Servo/UART.h
	server/tests/Hardware/ServoController.h
	server/tests/Hardware/ServoController/Dummy.h
	server/tests/Hardware/ServoController/UART.h
	server/tests/Point.h
	server/tests/Threads.cpp
	server/tests/Vehicle.cpp
	server/tests/Vehicle.h
	server/tests/Vehicle/Car.cpp
	server/tests/dashee.h
	server/tests/testVehicleCar.cpp
	server/tests/testVehicleMultirotorQuadX.cpp