dialog added
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/planetexpress/nimbus/Client.java