activity recognition added
Oblify.Udp/Enums.cs added, Oblify.Udp/OblifyPacketLight.cs added and commited
Ignore List added
added AcceleroMeter.java
git ignore updated
google play services removed
playservices added
Merge branch 'master' of github.com:Oblify/Server

Conflicts:
	.gitignore
	oblify-app/ActivityRecognition/ActivityRecognition/bin/dexedLibs/android-support-v4-34b41bd2dce447700d6d7fa3da757a62.jar
	oblify-app/ActivityRecognition/ActivityRecognition/bin/dexedLibs/android-support-v4-68a58b8cd5f02213a5d707f446eebc5c.jar
	oblify-app/ActivityRecognition/ActivityRecognition/bin/jarlist.cache
	oblify-app/BluetoothRSSI/AndroidManifest.xml
	oblify-app/BluetoothRSSI/bin/res/crunch/drawable-hdpi/ic_launcher.png
	oblify-app/BluetoothRSSI/bin/res/crunch/drawable-mdpi/ic_launcher.png
	oblify-app/BluetoothRSSI/bin/res/crunch/drawable-xhdpi/ic_launcher.png
	oblify-app/BluetoothRSSI/bin/res/crunch/drawable-xxhdpi/ic_launcher.png
	oblify-app/google-play-services_lib/.classpath
	oblify-app/google-play-services_lib/.project
	oblify-app/google-play-services_lib/.settings/org.eclipse.jdt.core.prefs
	oblify-app/google-play-services_lib/AndroidManifest.xml
	oblify-app/google-play-services_lib/README.txt
	oblify-app/google-play-services_lib/gen/com/google/android/gms/BuildConfig.java
	oblify-app/google-play-services_lib/gen/com/google/android/gms/R.java
	oblify-app/google-play-services_lib/proguard.txt
	oblify-app/google-play-services_lib/project.properties
	oblify-app/google-play-services_lib/res/color/common_signin_btn_text_dark.xml
	oblify-app/google-play-services_lib/res/color/common_signin_btn_text_light.xml
	oblify-app/google-play-services_lib/res/drawable-hdpi/common_signin_btn_icon_disabled_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_light.9.png
	oblify-app/google-play-services_lib/res/drawable-hdpi/common_signin_btn_icon_disabled_light.9.png
	oblify-app/google-play-services_lib/res/drawable-hdpi/common_signin_btn_icon_focus_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-hdpi/common_signin_btn_icon_focus_light.9.png
	oblify-app/google-play-services_lib/res/drawable-hdpi/common_signin_btn_icon_normal_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-hdpi/common_signin_btn_icon_normal_light.9.png
	oblify-app/google-play-services_lib/res/drawable-hdpi/common_signin_btn_icon_pressed_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-hdpi/common_signin_btn_icon_pressed_light.9.png
	oblify-app/google-play-services_lib/res/drawable-hdpi/common_signin_btn_text_disabled_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-hdpi/common_signin_btn_text_disabled_focus_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-hdpi/common_signin_btn_text_disabled_focus_light.9.png
	oblify-app/google-play-services_lib/res/drawable-hdpi/common_signin_btn_text_disabled_light.9.png
	oblify-app/google-play-services_lib/res/drawable-hdpi/common_signin_btn_text_focus_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-hdpi/common_signin_btn_text_focus_light.9.png
	oblify-app/google-play-services_lib/res/drawable-hdpi/common_signin_btn_text_normal_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-hdpi/common_signin_btn_text_normal_light.9.png
	oblify-app/google-play-services_lib/res/drawable-hdpi/common_signin_btn_text_pressed_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-hdpi/common_signin_btn_text_pressed_light.9.png
	oblify-app/google-play-services_lib/res/drawable-hdpi/ic_plusone_medium_off_client.png
	oblify-app/google-play-services_lib/res/drawable-hdpi/ic_plusone_small_off_client.png
	oblify-app/google-play-services_lib/res/drawable-hdpi/ic_plusone_standard_off_client.png
	oblify-app/google-play-services_lib/res/drawable-hdpi/ic_plusone_tall_off_client.png
	oblify-app/google-play-services_lib/res/drawable-mdpi/common_signin_btn_icon_disabled_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_light.9.png
	oblify-app/google-play-services_lib/res/drawable-mdpi/common_signin_btn_icon_disabled_light.9.png
	oblify-app/google-play-services_lib/res/drawable-mdpi/common_signin_btn_icon_focus_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-mdpi/common_signin_btn_icon_focus_light.9.png
	oblify-app/google-play-services_lib/res/drawable-mdpi/common_signin_btn_icon_normal_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-mdpi/common_signin_btn_icon_normal_light.9.png
	oblify-app/google-play-services_lib/res/drawable-mdpi/common_signin_btn_icon_pressed_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-mdpi/common_signin_btn_icon_pressed_light.9.png
	oblify-app/google-play-services_lib/res/drawable-mdpi/common_signin_btn_text_disabled_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-mdpi/common_signin_btn_text_disabled_focus_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-mdpi/common_signin_btn_text_disabled_focus_light.9.png
	oblify-app/google-play-services_lib/res/drawable-mdpi/common_signin_btn_text_disabled_light.9.png
	oblify-app/google-play-services_lib/res/drawable-mdpi/common_signin_btn_text_focus_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-mdpi/common_signin_btn_text_focus_light.9.png
	oblify-app/google-play-services_lib/res/drawable-mdpi/common_signin_btn_text_normal_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-mdpi/common_signin_btn_text_normal_light.9.png
	oblify-app/google-play-services_lib/res/drawable-mdpi/common_signin_btn_text_pressed_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-mdpi/common_signin_btn_text_pressed_light.9.png
	oblify-app/google-play-services_lib/res/drawable-mdpi/ic_plusone_medium_off_client.png
	oblify-app/google-play-services_lib/res/drawable-mdpi/ic_plusone_small_off_client.png
	oblify-app/google-play-services_lib/res/drawable-mdpi/ic_plusone_standard_off_client.png
	oblify-app/google-play-services_lib/res/drawable-mdpi/ic_plusone_tall_off_client.png
	oblify-app/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_icon_disabled_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_light.9.png
	oblify-app/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_icon_disabled_light.9.png
	oblify-app/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_icon_focus_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_icon_focus_light.9.png
	oblify-app/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_icon_normal_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_icon_normal_light.9.png
	oblify-app/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_icon_pressed_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_icon_pressed_light.9.png
	oblify-app/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_text_disabled_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_light.9.png
	oblify-app/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_text_disabled_light.9.png
	oblify-app/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_text_focus_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_text_focus_light.9.png
	oblify-app/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_text_normal_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_text_normal_light.9.png
	oblify-app/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_text_pressed_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_text_pressed_light.9.png
	oblify-app/google-play-services_lib/res/drawable-xhdpi/ic_plusone_medium_off_client.png
	oblify-app/google-play-services_lib/res/drawable-xhdpi/ic_plusone_small_off_client.png
	oblify-app/google-play-services_lib/res/drawable-xhdpi/ic_plusone_standard_off_client.png
	oblify-app/google-play-services_lib/res/drawable-xhdpi/ic_plusone_tall_off_client.png
	oblify-app/google-play-services_lib/res/drawable-xxhdpi/common_signin_btn_icon_disabled_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_light.9.png
	oblify-app/google-play-services_lib/res/drawable-xxhdpi/common_signin_btn_icon_disabled_light.9.png
	oblify-app/google-play-services_lib/res/drawable-xxhdpi/common_signin_btn_icon_focus_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-xxhdpi/common_signin_btn_icon_focus_light.9.png
	oblify-app/google-play-services_lib/res/drawable-xxhdpi/common_signin_btn_icon_normal_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-xxhdpi/common_signin_btn_icon_normal_light.9.png
	oblify-app/google-play-services_lib/res/drawable-xxhdpi/common_signin_btn_icon_pressed_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-xxhdpi/common_signin_btn_icon_pressed_light.9.png
	oblify-app/google-play-services_lib/res/drawable-xxhdpi/common_signin_btn_text_disabled_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_light.9.png
	oblify-app/google-play-services_lib/res/drawable-xxhdpi/common_signin_btn_text_disabled_light.9.png
	oblify-app/google-play-services_lib/res/drawable-xxhdpi/common_signin_btn_text_focus_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-xxhdpi/common_signin_btn_text_focus_light.9.png
	oblify-app/google-play-services_lib/res/drawable-xxhdpi/common_signin_btn_text_normal_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-xxhdpi/common_signin_btn_text_normal_light.9.png
	oblify-app/google-play-services_lib/res/drawable-xxhdpi/common_signin_btn_text_pressed_dark.9.png
	oblify-app/google-play-services_lib/res/drawable-xxhdpi/common_signin_btn_text_pressed_light.9.png
	oblify-app/google-play-services_lib/res/drawable-xxhdpi/ic_plusone_medium_off_client.png
	oblify-app/google-play-services_lib/res/drawable-xxhdpi/ic_plusone_small_off_client.png
	oblify-app/google-play-services_lib/res/drawable-xxhdpi/ic_plusone_standard_off_client.png
	oblify-app/google-play-services_lib/res/drawable-xxhdpi/ic_plusone_tall_off_client.png
	oblify-app/google-play-services_lib/res/drawable/common_signin_btn_icon_dark.xml
	oblify-app/google-play-services_lib/res/drawable/common_signin_btn_icon_light.xml
	oblify-app/google-play-services_lib/res/drawable/common_signin_btn_text_dark.xml
	oblify-app/google-play-services_lib/res/drawable/common_signin_btn_text_light.xml
	oblify-app/google-play-services_lib/res/values-af/strings.xml
	oblify-app/google-play-services_lib/res/values-am/strings.xml
	oblify-app/google-play-services_lib/res/values-ar/strings.xml
	oblify-app/google-play-services_lib/res/values-be/strings.xml
	oblify-app/google-play-services_lib/res/values-bg/strings.xml
	oblify-app/google-play-services_lib/res/values-ca/strings.xml
	oblify-app/google-play-services_lib/res/values-cs/strings.xml
	oblify-app/google-play-services_lib/res/values-da/strings.xml
	oblify-app/google-play-services_lib/res/values-de/strings.xml
	oblify-app/google-play-services_lib/res/values-el/strings.xml
	oblify-app/google-play-services_lib/res/values-en-rGB/strings.xml
	oblify-app/google-play-services_lib/res/values-en-rIN/strings.xml
	oblify-app/google-play-services_lib/res/values-es-rUS/strings.xml
	oblify-app/google-play-services_lib/res/values-es/strings.xml
	oblify-app/google-play-services_lib/res/values-et-rEE/strings.xml
	oblify-app/google-play-services_lib/res/values-et/strings.xml
	oblify-app/google-play-services_lib/res/values-fa/strings.xml
	oblify-app/google-play-services_lib/res/values-fi/strings.xml
	oblify-app/google-play-services_lib/res/values-fr-rCA/strings.xml
	oblify-app/google-play-services_lib/res/values-fr/strings.xml
	oblify-app/google-play-services_lib/res/values-hi/strings.xml
	oblify-app/google-play-services_lib/res/values-hr/strings.xml
	oblify-app/google-play-services_lib/res/values-hu/strings.xml
	oblify-app/google-play-services_lib/res/values-hy-rAM/strings.xml
	oblify-app/google-play-services_lib/res/values-in/strings.xml
	oblify-app/google-play-services_lib/res/values-it/strings.xml
	oblify-app/google-play-services_lib/res/values-iw/strings.xml
	oblify-app/google-play-services_lib/res/values-ja/strings.xml
	oblify-app/google-play-services_lib/res/values-ka-rGE/strings.xml
	oblify-app/google-play-services_lib/res/values-km-rKH/strings.xml
	oblify-app/google-play-services_lib/res/values-ko/strings.xml
	oblify-app/google-play-services_lib/res/values-lo-rLA/strings.xml
	oblify-app/google-play-services_lib/res/values-lt/strings.xml
	oblify-app/google-play-services_lib/res/values-lv/strings.xml
	oblify-app/google-play-services_lib/res/values-mn-rMN/strings.xml
	oblify-app/google-play-services_lib/res/values-ms-rMY/strings.xml
	oblify-app/google-play-services_lib/res/values-ms/strings.xml
	oblify-app/google-play-services_lib/res/values-nb/strings.xml
	oblify-app/google-play-services_lib/res/values-nl/strings.xml
	oblify-app/google-play-services_lib/res/values-pl/strings.xml
	oblify-app/google-play-services_lib/res/values-pt-rBR/strings.xml
	oblify-app/google-play-services_lib/res/values-pt-rPT/strings.xml
	oblify-app/google-play-services_lib/res/values-pt/strings.xml
	oblify-app/google-play-services_lib/res/values-ro/strings.xml
	oblify-app/google-play-services_lib/res/values-ru/strings.xml
	oblify-app/google-play-services_lib/res/values-sk/strings.xml
	oblify-app/google-play-services_lib/res/values-sl/strings.xml
	oblify-app/google-play-services_lib/res/values-sr/strings.xml
	oblify-app/google-play-services_lib/res/values-sv/strings.xml
	oblify-app/google-play-services_lib/res/values-sw/strings.xml
	oblify-app/google-play-services_lib/res/values-th/strings.xml
	oblify-app/google-play-services_lib/res/values-tl/strings.xml
	oblify-app/google-play-services_lib/res/values-tr/strings.xml
	oblify-app/google-play-services_lib/res/values-uk/strings.xml
	oblify-app/google-play-services_lib/res/values-vi/strings.xml
	oblify-app/google-play-services_lib/res/values-zh-rCN/strings.xml
	oblify-app/google-play-services_lib/res/values-zh-rHK/strings.xml
	oblify-app/google-play-services_lib/res/values-zh-rTW/strings.xml
	oblify-app/google-play-services_lib/res/values-zu/strings.xml
	oblify-app/google-play-services_lib/res/values/ads_attrs.xml
	oblify-app/google-play-services_lib/res/values/colors.xml
	oblify-app/google-play-services_lib/res/values/maps_attrs.xml
	oblify-app/google-play-services_lib/res/values/strings.xml
	oblify-app/google-play-services_lib/res/values/version.xml
	oblify-app/google-play-services_lib/src/android/UnusedStub.java