modified:   README.md
deleted:    documentation/class diagram/class diagram.png
modified:   java/README.md
modified:   java/applications/README.md
modified:   java/applications/blingled/AndroidManifest.xml
renamed:    java/applications/blingled/pixelleds/PixelLeds.java -> java/applications/blingled/src/no/ntnu/osnap/pixelleds/PixelLeds.java
renamed:    java/applications/blingled/pixelleds/Pixelater.java -> java/applications/blingled/src/no/ntnu/osnap/pixelleds/Pixelater.java
modified:   java/applications/facebook/src/no/ntnu/osnap/social/facebook/FacebookActivity.java
modified:   java/applications/generic/AndroidManifest.xml
deleted:    java/applications/generic/L.java
new file:   java/applications/generic/src/no/ntnu/osnap/generic/L.java
renamed:    java/applications/generic/OsnapApp.java -> java/applications/generic/src/no/ntnu/osnap/generic/OsnapApp.java
renamed:    java/applications/temperature/Preferences.java -> java/applications/temperature/src/no/ntnu/osnap/temp/Preferences.java
renamed:    java/applications/temperature/TempMeasure.java -> java/applications/temperature/src/no/ntnu/osnap/temp/TempMeasure.java
modified:   java/applications/tshirt/src/no/ntnu/osnap/tshirt/ServiceDataFetcher.java
modified:   java/applications/tshirt/src/no/ntnu/osnap/tshirt/filterMode/ChangeMode.java
modified:   java/applications/tshirt/src/no/ntnu/osnap/tshirt/filterMode/FilterCompare.java
modified:   java/applications/tshirt/src/no/ntnu/osnap/tshirt/filterMode/FilterMessage.java
modified:   java/applications/tshirt/src/no/ntnu/osnap/tshirt/filterMode/FilterNotification.java
modified:   java/applications/tshirt/src/no/ntnu/osnap/tshirt/filterMode/FilterPerson.java
modified:   java/applications/tshirt/src/no/ntnu/osnap/tshirt/filterMode/FilterStart.java
modified:   java/applications/tshirt/src/no/ntnu/osnap/tshirt/helperClass/RuleArduinoTransfer.java
modified:   java/applications/twitter/src/no/ntnu/osnap/social/twitter/TwitterActivity.java
modified:   java/applications/twitter/src/no/ntnu/osnap/social/twitter/TwitterService.java
renamed:    java/com-lib/no/ntnu/osnap/com/BluetoothConnection.java -> java/com-lib/src/no/ntnu/osnap/com/BluetoothConnection.java
renamed:    java/com-lib/no/ntnu/osnap/com/ComLibException.java -> java/com-lib/src/no/ntnu/osnap/com/ComLibException.java
renamed:    java/com-lib/no/ntnu/osnap/com/ConnectionListener.java -> java/com-lib/src/no/ntnu/osnap/com/ConnectionListener.java
renamed:    java/com-lib/no/ntnu/osnap/com/ConnectionMetadata.java -> java/com-lib/src/no/ntnu/osnap/com/ConnectionMetadata.java
renamed:    java/com-lib/no/ntnu/osnap/com/ConnectionThread.java -> java/com-lib/src/no/ntnu/osnap/com/ConnectionThread.java
renamed:    java/com-lib/no/ntnu/osnap/com/Protocol.java -> java/com-lib/src/no/ntnu/osnap/com/Protocol.java
renamed:    java/com-lib/no/ntnu/osnap/com/ProtocolInstruction.java -> java/com-lib/src/no/ntnu/osnap/com/ProtocolInstruction.java
renamed:    java/com-lib/no/ntnu/osnap/com/testing/ComLayer.java -> java/com-lib/src/no/ntnu/osnap/com/testing/ComLayer.java
renamed:    java/com-lib/no/ntnu/osnap/com/testing/ComLayerTest.java -> java/com-lib/src/no/ntnu/osnap/com/testing/ComLayerTest.java
renamed:    java/com-lib/no/ntnu/osnap/com/testing/ProtocolTest.java -> java/com-lib/src/no/ntnu/osnap/com/testing/ProtocolTest.java
renamed:    java/com-lib/no/ntnu/osnap/com/testing/SerialTest.java -> java/com-lib/src/no/ntnu/osnap/com/testing/SerialTest.java
deleted:    java/mockups/prototype/SampleActivity.java
modified:   java/mockups/prototype/src/no/ntnu/osnap/mockups/prototype/SampleActivity.java
deleted:    java/mockups/service/MockupActivity.java
deleted:    java/mockups/service/MockupService.java
modified:   java/mockups/service/src/no/ntnu/osnap/mockups/service/MockupActivity.java
modified:   java/mockups/service/src/no/ntnu/osnap/mockups/service/MockupService.java
deleted:    tshirtApp/AndroidManifest.xml
deleted:    tshirtApp/gen/com/osnap/app/tshirt/R.java
deleted:    tshirtApp/res/layout/filters_row.xml
deleted:    tshirtApp/res/layout/rules_edit.xml
deleted:    tshirtApp/res/layout/rules_list.xml
deleted:    tshirtApp/res/layout/rules_row.xml
deleted:    tshirtApp/res/values/strings.xml
deleted:    tshirtApp/src/com/osnap/app/tshirt/FilterAdder.java
deleted:    tshirtApp/src/com/osnap/app/tshirt/RuleEdit.java
deleted:    tshirtApp/src/com/osnap/app/tshirt/RulesDbAdapter.java
deleted:    tshirtApp/src/com/osnap/app/tshirt/TshirtApp.java
Merge branch 'master' of https://github.com/it2901g10/GROUP10-baf_sintef_arduino