offpage e refresh
Merge remote-tracking branch 'origin/master'

Conflicts:
	App/src/main/java/com/example/umorning/activities/SettingsActivity.java
activated