Added L10n fix for notification and on first unlock activity
Merge remote-tracking branch 'origin/l10_notification_unlock' into l10_notification_unlock

Conflicts:
	src/org/thoughtcrime/securesms/RoutingActivity.java