fixed comment aspect
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ninja/PanicHelper/MainActivity.java
	src/ninja/PanicHelper/configurations/Configurations.java
	src/ninja/PanicHelper/configurations/SeekBarPreference.java
	src/ninja/PanicHelper/contacts/Contact.java
	src/ninja/PanicHelper/contacts/ContactActivity.java
	src/ninja/PanicHelper/detectors/Accelerometer.java
	src/ninja/PanicHelper/fragments/EmergencyContactsFragment.java
	src/ninja/PanicHelper/fragments/FacebookAccountFragment.java
	src/ninja/PanicHelper/fragments/HomeFragment.java
	src/ninja/PanicHelper/fragments/SettingsFragment.java
	src/ninja/PanicHelper/safetyMeasures/GPSTracker.java
	src/ninja/PanicHelper/safetyMeasures/Light.java
	src/ninja/PanicHelper/safetyMeasures/Sms.java
	src/ninja/PanicHelper/safetyMeasures/Sound.java
	src/ninja/PanicHelper/safetyMeasures/VoiceMessage.java
fixed Contact activity toast
Merge remote-tracking branch 'origin/master'