language manager...
icon manager + some fix and opt
fix fix , improvement
a bit messy but unfinished...
deviceManager....
configuration
ugly thread removed
Merge remote-tracking branch 'remotes/origin/murielv2'

Conflicts:
	zipato_android_v2/src/main/java/android/zipato_android_v2/app/BrowserManagerActivity.java
	zipato_android_v2/src/main/java/android/zipato_android_v2/app/LogInActivity.java
	zipato_android_v2/src/main/java/android/zipato_android_v2/app/RegisterActivity.java
	zipato_android_v2/src/main/java/android/zipato_android_v2/app/ZipatoApplication.java
	zipato_android_v2/src/main/java/android/zipato_android_v2/app/ui/fragments/SettingMenuFragment.java
	zipato_android_v2/src/main/java/com/zipato/appv2/AttributesBrowserActivity.java
	zipato_android_v2/src/main/java/com/zipato/appv2/AttributesBrowserActivityTest.java
	zipato_android_v2/src/main/java/com/zipato/appv2/BaseActivity.java
	zipato_android_v2/src/main/java/com/zipato/appv2/DeviceManagerActivity.java
	zipato_android_v2/src/main/java/com/zipato/appv2/RecoveryPasswordActivity.java
	zipato_android_v2/src/main/java/com/zipato/appv2/ui/ExpendableListerViewCustomAdapter.java
	zipato_android_v2/src/main/java/com/zipato/appv2/ui/ServiceInfoAdapter.java
	zipato_android_v2/src/main/java/com/zipato/data/RepositoryFactory.java
	zipato_android_v2/src/main/java/com/zipato/data/RepositoryFactoryImpl.java
	zipato_android_v2/src/main/java/com/zipato/data/SimpleRepository.java
	zipato_android_v2/src/main/java/com/zipato/data/UUIDObjectRepository.java
	zipato_android_v2/src/main/java/com/zipato/data/attribute/AttributeRepository.java
	zipato_android_v2/src/main/java/com/zipato/data/attribute/AttributeValueRepository.java
	zipato_android_v2/src/main/java/com/zipato/data/device/DeviceListener.java
	zipato_android_v2/src/main/java/com/zipato/data/device/DeviceRepository.java
	zipato_android_v2/src/main/java/com/zipato/data/device/DeviceStateRepository.java
	zipato_android_v2/src/main/java/com/zipato/data/typereport/TypeReportRepository.java
	zipato_android_v2/src/main/java/com/zipato/translation_v2/LanguageManager.java
	zipato_android_v2/src/main/java/com/zipato/v2/client/ApiV2RestTemplate.java
	zipato_android_v2/src/main/java/discovery/DiscoveryManager.java
	zipato_android_v2/src/main/res/values/pref_keys.xml
	zipato_android_v2/zipato_android_v2.iml
scenes...
run scenes, new build.grade...
scenes...
merging
more merging
friday 7/4/2014
friday 7/4/2014
dumbass lowcase class fix
dunno
Merge remote-tracking branch 'remotes/origin/murielV2'

Conflicts:
	sliding_menu/build/generated/source/r/debug/com/jeremyfeinstein/slidingmenu/lib/R.java
	sliding_menu/build/generated/source/r/release/com/jeremyfeinstein/slidingmenu/lib/R.java
	sliding_menu/sliding_menu.iml
	zipato_android_v2/src/main/java/android/zipato_android_v2/app/DeviceManagerActivity.java
	zipato_android_v2/src/main/java/android/zipato_android_v2/app/RecoveryPasswordActivity.java
	zipato_android_v2/src/main/java/android/zipato_android_v2/app/ui/fragments/device/manager/BaseFragment.java
	zipato_android_v2/src/main/java/android/zipato_android_v2/app/ui/fragments/device/manager/BaseFragmentDeviceManager.java
	zipato_android_v2/src/main/java/android/zipato_android_v2/app/ui/fragments/device/manager/ClusterEndpointFragment.java
	zipato_android_v2/src/main/java/android/zipato_android_v2/app/ui/fragments/device/manager/ClusterEndpointFragmentDeviceManager.java
	zipato_android_v2/src/main/java/android/zipato_android_v2/app/ui/fragments/device/manager/DevicesFragment.java
	zipato_android_v2/src/main/java/android/zipato_android_v2/app/ui/fragments/device/manager/DevicesFragmentDeviceManager.java
	zipato_android_v2/src/main/java/android/zipato_android_v2/app/ui/fragments/device/manager/EndpointFragment.java
	zipato_android_v2/src/main/java/android/zipato_android_v2/app/ui/fragments/device/manager/EndpointFragmentDeviceManager.java
	zipato_android_v2/src/main/java/android/zipato_android_v2/app/ui/fragments/device/manager/NetworkFragment.java
	zipato_android_v2/src/main/java/android/zipato_android_v2/app/ui/fragments/device/manager/NetworkFragmentDeviceManager.java
	zipato_android_v2/src/main/java/com/zipato/appv2/AttributesBrowserActivity.java
	zipato_android_v2/src/main/java/com/zipato/appv2/BaseActivity.java
	zipato_android_v2/src/main/java/com/zipato/appv2/ui/fragments/dm/BaseFragment.java
	zipato_android_v2/src/main/java/com/zipato/appv2/ui/fragments/dm/ClusterEndpointFragment.java
	zipato_android_v2/src/main/java/com/zipato/appv2/ui/fragments/dm/DevicesFragment.java
	zipato_android_v2/src/main/java/com/zipato/appv2/ui/fragments/dm/EndpointFragment.java
	zipato_android_v2/src/main/java/com/zipato/appv2/ui/fragments/dm/NetworkFragment.java
	zipato_android_v2/src/main/java/com/zipato/data/RepositoryFactoryImpl.java
	zipato_android_v2/src/main/java/com/zipato/data/RepositoryListener.java
	zipato_android_v2/src/main/java/com/zipato/translation_v2/LanguageManager.java
	zipato_android_v2/zipato_android_v2.iml
Merge remote-tracking branch 'remotes/origin/murielV2'