notifications
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/freeuni/android/delegator/app/App.java
meerge
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/freeuni/android/delegator/app/App.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/freeuni/android/delegator/app/App.java