Salvare intre sesiuni
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/the_four_amigos/panic_helper/ConfigurationActivity.java
	src/com/the_four_amigos/panic_helper/Configurations.java