Now possible to share profiles // they have to be connected to the same
wifi network,
and should have their proximity sensors covered
Forgot add to index
Merge branch 'master' of https://github.com/adi10ain/MAMN01.git

Conflicts:
	aProfile/bin/aProfile.apk
	aProfile/bin/classes.dex
	aProfile/bin/classes/com/LTH/aprofile/Classes/Profile.class
	aProfile/bin/classes/com/LTH/aprofile/DynamicAnimation.class
	aProfile/bin/classes/com/LTH/aprofile/MainActivity$WifiReceiver.class
	aProfile/bin/classes/com/LTH/aprofile/MainActivity.class
	aProfile/bin/classes/com/LTH/aprofile/NewprofileActivity.class
	aProfile/bin/classes/com/LTH/aprofile/PieChartOverlay.class
	aProfile/bin/classes/com/LTH/aprofile/PieChartView.class
	aProfile/bin/classes/com/LTH/aprofile/Preferences/SoundLevelPreference.class
	aProfile/bin/classes/com/LTH/aprofile/Preferences/VibrationPreference.class
	aProfile/bin/classes/com/LTH/aprofile/R$id.class
	aProfile/bin/classes/com/LTH/aprofile/R$layout.class
	aProfile/bin/classes/com/LTH/aprofile/R$menu.class
	aProfile/bin/classes/com/LTH/aprofile/R$string.class
	aProfile/bin/classes/com/LTH/aprofile/R$style.class
	aProfile/bin/classes/com/LTH/aprofile/SettingsActivity.class
	aProfile/bin/classes/com/LTH/aprofile/SettingsChartActivity$DynamicAnimation2.class
	aProfile/bin/classes/com/LTH/aprofile/SettingsChartActivity$PieChartOverlay2.class
	aProfile/bin/classes/com/LTH/aprofile/SettingsChartActivity.class
	aProfile/bin/classes/com/LTH/aprofile/Test_Orientation.class
	aProfile/bin/resources.ap_
	aProfile/gen/com/LTH/aprofile/R.java
	aProfile/src/com/LTH/aprofile/Classes/Profile.java
	aProfile/src/com/LTH/aprofile/MainActivity.java
	aProfile/src/com/LTH/aprofile/Preferences/VibrationPreference.java
	aProfile/src/com/LTH/aprofile/SettingsChartActivity.java