AlertDialog survive after orientation change fix #238

Signed-off-by: Andrea Cappelli <a.cappelli87@gmail.com>
Merge branch 'master' into ui_material

Signed-off-by: Andrea Cappelli <a.cappelli87@gmail.com>

Conflicts:
	app/src/main/AndroidManifest.xml