minor changes
minor merges
minor
merged
added encryption dialog to chatactivity