diff --git a/app/build.gradle b/app/build.gradle
index 64e302b9a..8c0570960 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
     defaultConfig {
         applicationId "org.rfcx.ranger"
         manifestPlaceholders = [auth0Domain: "@string/auth0_domain", auth0Scheme: "@string/auth0_scheme"]
-        versionCode 84
-        versionName "1.2.5"
+        versionCode 87
+        versionName "1.2.6"
         minSdkVersion 19
         targetSdkVersion 29
         multiDexEnabled true
diff --git a/app/src/main/java/org/rfcx/ranger/RangerApplication.kt b/app/src/main/java/org/rfcx/ranger/RangerApplication.kt
index f4fe0de19..fcf87a2dd 100644
--- a/app/src/main/java/org/rfcx/ranger/RangerApplication.kt
+++ b/app/src/main/java/org/rfcx/ranger/RangerApplication.kt
@@ -15,6 +15,7 @@ import org.koin.core.context.startKoin
 import org.koin.core.module.Module
 import org.rfcx.ranger.di.DataModule
 import org.rfcx.ranger.di.UiModule
+import org.rfcx.ranger.service.CleanupAudioCacheWorker
 import org.rfcx.ranger.service.LocationCleanupWorker
 import org.rfcx.ranger.service.ReportCleanupWorker
 import org.rfcx.ranger.util.RealmHelper
@@ -36,6 +37,7 @@ class RangerApplication : MultiDexApplication() {
 		setupKoin()
 		ReportCleanupWorker.enqueuePeriodically()
 		LocationCleanupWorker.enqueuePeriodically()
+		CleanupAudioCacheWorker.enqueuePeriodically()
 		
 		if (BuildConfig.USE_STETHO) {
 			Stetho.initialize(Stetho.newInitializerBuilder(this)
diff --git a/app/src/main/java/org/rfcx/ranger/data/local/EventDb.kt b/app/src/main/java/org/rfcx/ranger/data/local/EventDb.kt
index f80e732d9..e0afeb13b 100644
--- a/app/src/main/java/org/rfcx/ranger/data/local/EventDb.kt
+++ b/app/src/main/java/org/rfcx/ranger/data/local/EventDb.kt
@@ -38,6 +38,7 @@ class EventDb(val realm: Realm) {
 		realm.use { it ->
 			it.executeTransaction {
 				val events = it.where(Event::class.java)
+						.sort("beginsAt",Sort.DESCENDING)
 						.findAll()
 				list.addAll(it.copyFromRealm(events))
 			}
diff --git a/app/src/main/java/org/rfcx/ranger/data/remote/service/ServiceFactory.kt b/app/src/main/java/org/rfcx/ranger/data/remote/service/ServiceFactory.kt
index c320a2c9e..be85a6531 100644
--- a/app/src/main/java/org/rfcx/ranger/data/remote/service/ServiceFactory.kt
+++ b/app/src/main/java/org/rfcx/ranger/data/remote/service/ServiceFactory.kt
@@ -18,6 +18,7 @@ import org.rfcx.ranger.data.remote.setusername.SetNameEndpoint
 import org.rfcx.ranger.data.remote.shortlink.ShortLinkEndpoint
 import org.rfcx.ranger.data.remote.site.SiteEndpoint
 import org.rfcx.ranger.data.remote.subscribe.SubscribeEndpoint
+import org.rfcx.ranger.data.remote.terms.TermsEndpoint
 import org.rfcx.ranger.data.remote.usertouch.UserTouchEndPoint
 import org.rfcx.ranger.util.GsonProvider
 import org.rfcx.ranger.util.ImprovedDateTypeAdapter
@@ -101,6 +102,12 @@ object ServiceFactory {
 				.create(SubscribeEndpoint::class.java)
 	}
 	
+	fun makeTermsService(isDebug: Boolean, context: Context): TermsEndpoint {
+		return createRetrofit(BuildConfig.RANGER_DOMAIN, createAuthTokenOkHttpClient(isDebug, AuthTokenInterceptor(context)),
+				GsonProvider.getInstance().gson)
+				.create(TermsEndpoint::class.java)
+	}
+	
 	private fun createRetrofit(baseUrl: String, okHttpClient: OkHttpClient, gson: Gson): Retrofit {
 		return Retrofit.Builder().baseUrl(baseUrl)
 				.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
diff --git a/app/src/main/java/org/rfcx/ranger/data/remote/terms/TermsEndpoint.kt b/app/src/main/java/org/rfcx/ranger/data/remote/terms/TermsEndpoint.kt
new file mode 100644
index 000000000..3cc103161
--- /dev/null
+++ b/app/src/main/java/org/rfcx/ranger/data/remote/terms/TermsEndpoint.kt
@@ -0,0 +1,12 @@
+package org.rfcx.ranger.data.remote.terms
+
+import io.reactivex.Single
+import org.rfcx.ranger.entity.terms.TermsRequest
+import org.rfcx.ranger.entity.terms.TermsResponse
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface TermsEndpoint {
+	@POST("v1/users/accept-terms")
+	fun sendPayload(@Body body: TermsRequest): Single<TermsResponse>
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/rfcx/ranger/data/remote/terms/TermsRepository.kt b/app/src/main/java/org/rfcx/ranger/data/remote/terms/TermsRepository.kt
new file mode 100644
index 000000000..ecf640291
--- /dev/null
+++ b/app/src/main/java/org/rfcx/ranger/data/remote/terms/TermsRepository.kt
@@ -0,0 +1,9 @@
+package org.rfcx.ranger.data.remote.terms
+
+import io.reactivex.Single
+import org.rfcx.ranger.entity.terms.TermsRequest
+import org.rfcx.ranger.entity.terms.TermsResponse
+
+interface TermsRepository {
+	fun sendBodyPayload(sendBody: TermsRequest): Single<TermsResponse>
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/rfcx/ranger/data/remote/terms/TermsRepositoryImp.kt b/app/src/main/java/org/rfcx/ranger/data/remote/terms/TermsRepositoryImp.kt
new file mode 100644
index 000000000..187976f79
--- /dev/null
+++ b/app/src/main/java/org/rfcx/ranger/data/remote/terms/TermsRepositoryImp.kt
@@ -0,0 +1,11 @@
+package org.rfcx.ranger.data.remote.terms
+
+import io.reactivex.Single
+import org.rfcx.ranger.entity.terms.TermsRequest
+import org.rfcx.ranger.entity.terms.TermsResponse
+
+class TermsRepositoryImp(private val termsEndpoint: TermsEndpoint) : TermsRepository {
+	override fun sendBodyPayload(sendBody: TermsRequest): Single<TermsResponse> {
+		return termsEndpoint.sendPayload(sendBody)
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/rfcx/ranger/data/remote/terms/TermsUseCase.kt b/app/src/main/java/org/rfcx/ranger/data/remote/terms/TermsUseCase.kt
new file mode 100644
index 000000000..67ae01425
--- /dev/null
+++ b/app/src/main/java/org/rfcx/ranger/data/remote/terms/TermsUseCase.kt
@@ -0,0 +1,16 @@
+package org.rfcx.ranger.data.remote.terms
+
+import io.reactivex.Single
+import org.rfcx.ranger.data.remote.domain.SingleUseCase
+import org.rfcx.ranger.data.remote.domain.executor.PostExecutionThread
+import org.rfcx.ranger.data.remote.domain.executor.ThreadExecutor
+import org.rfcx.ranger.entity.terms.TermsRequest
+import org.rfcx.ranger.entity.terms.TermsResponse
+
+class TermsUseCase(private val termsRepository: TermsRepository,
+                   threadExecutor: ThreadExecutor, postExecutionThread: PostExecutionThread
+) : SingleUseCase<TermsRequest, TermsResponse>(threadExecutor, postExecutionThread) {
+	override fun buildUseCaseObservable(params: TermsRequest): Single<TermsResponse> {
+		return termsRepository.sendBodyPayload(params)
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/rfcx/ranger/di/DataModule.kt b/app/src/main/java/org/rfcx/ranger/di/DataModule.kt
index 55ff56cba..fbd44af8a 100644
--- a/app/src/main/java/org/rfcx/ranger/di/DataModule.kt
+++ b/app/src/main/java/org/rfcx/ranger/di/DataModule.kt
@@ -50,6 +50,9 @@ import org.rfcx.ranger.data.remote.subscribe.SubscribeUseCase
 import org.rfcx.ranger.data.remote.subscribe.unsubscribe.UnsubscribeRepository
 import org.rfcx.ranger.data.remote.subscribe.unsubscribe.UnsubscribeRepositoryImp
 import org.rfcx.ranger.data.remote.subscribe.unsubscribe.UnsubscribeUseCase
+import org.rfcx.ranger.data.remote.terms.TermsRepository
+import org.rfcx.ranger.data.remote.terms.TermsRepositoryImp
+import org.rfcx.ranger.data.remote.terms.TermsUseCase
 import org.rfcx.ranger.data.remote.usertouch.CheckUserTouchUseCase
 import org.rfcx.ranger.data.remote.usertouch.UserTouchRepository
 import org.rfcx.ranger.data.remote.usertouch.UserTouchRepositoryImp
@@ -110,6 +113,9 @@ object DataModule {
 		single { UnsubscribeRepositoryImp(get()) } bind UnsubscribeRepository::class
 		single { UnsubscribeUseCase(get(), get(), get()) }
 		
+		single { TermsRepositoryImp(get()) } bind TermsRepository::class
+		single { TermsUseCase(get(), get(), get()) }
+		
 	}
 	
 	val remoteModule = module {
@@ -125,6 +131,7 @@ object DataModule {
 		factory { ServiceFactory.makePasswordService(BuildConfig.DEBUG, androidContext()) }
 		factory { ServiceFactory.makeProfilePhotoService(BuildConfig.DEBUG, androidContext()) }
 		factory { ServiceFactory.makeSubscribeService(BuildConfig.DEBUG, androidContext()) }
+		factory { ServiceFactory.makeTermsService(BuildConfig.DEBUG, androidContext()) }
 	}
 	
 	val localModule = module {
diff --git a/app/src/main/java/org/rfcx/ranger/di/UiModule.kt b/app/src/main/java/org/rfcx/ranger/di/UiModule.kt
index b5f354ab9..597d86414 100644
--- a/app/src/main/java/org/rfcx/ranger/di/UiModule.kt
+++ b/app/src/main/java/org/rfcx/ranger/di/UiModule.kt
@@ -14,6 +14,7 @@ import org.rfcx.ranger.view.alerts.guardian.alertType.AlertValueViewModel
 import org.rfcx.ranger.view.login.InvitationCodeViewModel
 import org.rfcx.ranger.view.login.LoginViewModel
 import org.rfcx.ranger.view.login.SetUserNameViewModel
+import org.rfcx.ranger.view.login.TermsAndServiceViewModel
 import org.rfcx.ranger.view.map.MapDetailViewModel
 import org.rfcx.ranger.view.map.MapViewModel
 import org.rfcx.ranger.view.map.ReportViewPagerFragmentViewModel
@@ -67,5 +68,6 @@ object UiModule {
 		viewModel { LoginViewModel(androidContext(), get()) }
 		viewModel { InvitationCodeViewModel(androidContext(), get()) }
 		viewModel { SetUserNameViewModel(androidContext(), get()) }
+		viewModel { TermsAndServiceViewModel(androidContext(), get()) }
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/rfcx/ranger/entity/terms/Terms.kt b/app/src/main/java/org/rfcx/ranger/entity/terms/Terms.kt
new file mode 100644
index 000000000..76870774d
--- /dev/null
+++ b/app/src/main/java/org/rfcx/ranger/entity/terms/Terms.kt
@@ -0,0 +1,12 @@
+package org.rfcx.ranger.entity.terms
+
+import com.google.gson.annotations.SerializedName
+
+open class TermsRequest(
+		val app: String
+)
+
+open class TermsResponse(
+		@SerializedName("success")
+		val success: Boolean
+)
\ No newline at end of file
diff --git a/app/src/main/java/org/rfcx/ranger/entity/user/InvitationCodeRequest.kt b/app/src/main/java/org/rfcx/ranger/entity/user/InvitationCodeRequest.kt
index 460a8ca8c..0f8fdbace 100644
--- a/app/src/main/java/org/rfcx/ranger/entity/user/InvitationCodeRequest.kt
+++ b/app/src/main/java/org/rfcx/ranger/entity/user/InvitationCodeRequest.kt
@@ -4,5 +4,11 @@ import com.google.gson.annotations.SerializedName
 
 data class InvitationCodeRequest(
 		@SerializedName("code")
-		val code: String
+		val code: String,
+		
+		@SerializedName("accept_terms")
+		val acceptTerms: String,
+		
+		@SerializedName("app")
+		val app: String
 )
\ No newline at end of file
diff --git a/app/src/main/java/org/rfcx/ranger/entity/user/UserAuthResponse.kt b/app/src/main/java/org/rfcx/ranger/entity/user/UserAuthResponse.kt
index 77bb55742..fe3213bf3 100644
--- a/app/src/main/java/org/rfcx/ranger/entity/user/UserAuthResponse.kt
+++ b/app/src/main/java/org/rfcx/ranger/entity/user/UserAuthResponse.kt
@@ -6,7 +6,7 @@ package org.rfcx.ranger.entity.user
 
 data class UserAuthResponse (val guid: String, val email: String?, val nickname: String?,
                              val idToken: String, val accessToken: String?, val refreshToken: String?,
-                             val roles: Set<String> = setOf(), val accessibleSites: Set<String> = setOf(), val defaultSite: String? = null, val picture: String?) {
+                             val roles: Set<String> = setOf(), val accessibleSites: Set<String> = setOf(), val defaultSite: String? = null, val picture: String?, val consentGivenRangerApp: String?) {
 
     val isRanger: Boolean get() = roles.contains("rfcxUser") && defaultSite != null
 
diff --git a/app/src/main/java/org/rfcx/ranger/service/CleanupAudioCacheWorker.kt b/app/src/main/java/org/rfcx/ranger/service/CleanupAudioCacheWorker.kt
new file mode 100644
index 000000000..c19e60e19
--- /dev/null
+++ b/app/src/main/java/org/rfcx/ranger/service/CleanupAudioCacheWorker.kt
@@ -0,0 +1,74 @@
+package org.rfcx.ranger.service
+
+import android.content.Context
+import androidx.lifecycle.LiveData
+import androidx.work.*
+import java.io.File
+import java.util.*
+import java.util.concurrent.TimeUnit
+
+class CleanupAudioCacheWorker(val context: Context, workerParams: WorkerParameters) : Worker(context, workerParams) {
+	
+	private val audioDirectory = File(context.cacheDir, DownLoadEventWorker.AUDIOS_SUB_DIRECTORY)
+	
+	override fun doWork(): Result {
+		removeAudioCache()
+		removeAudioInCache(applicationContext)
+		return Result.success()
+	}
+	
+	/*
+	/* for version higher or equal 1.2.6
+		remove .opus all opus in 'audios' cache directory
+	*/
+	 */
+	private fun removeAudioCache() {
+		val date = Date(System.currentTimeMillis())
+		audioDirectory.listFiles()?.forEach {
+			if (it.isFile
+					&& (it.name.substring(it.name.lastIndexOf(".") + 1) == "opus")
+					&& it.isLastModifiedOlderThan2Weeks(date)) {
+				try {
+					it.delete()
+				} catch (e: Exception) {
+					e.printStackTrace()
+				}
+			}
+		}
+	}
+	
+	/* for old version below 1.2.6
+		remove .opus all opus in main cache directory
+	*/
+	private fun removeAudioInCache(context: Context) {
+		val date = Date(System.currentTimeMillis())
+		context.cacheDir.listFiles()?.forEach {
+			if (it.isFile && it.isLastModifiedOlderThan2Weeks(date)) {
+				try {
+					it.delete()
+				} catch (e: Exception) {
+					e.printStackTrace()
+				}
+			}
+		}
+	}
+	
+	private fun File.isLastModifiedOlderThan2Weeks(date: Date): Boolean {
+		return (date.time - this.lastModified()) > TWO_WEEKS
+	}
+	
+	companion object {
+		const val TWO_WEEKS: Long = 60 * 1000 * 60 * 24 * 14
+		private const val UNIQUE_WORK_KEY = "CleanupAudioCacheWorker"
+		const val AUDIOS_SUB_DIRECTORY = "audios"
+		
+		fun enqueuePeriodically() {
+			val workRequest = PeriodicWorkRequestBuilder<CleanupAudioCacheWorker>(1, TimeUnit.DAYS).build()
+			WorkManager.getInstance().enqueueUniquePeriodicWork(UNIQUE_WORK_KEY, ExistingPeriodicWorkPolicy.REPLACE, workRequest)
+		}
+		
+		fun workInfos(): LiveData<List<WorkInfo>> {
+			return WorkManager.getInstance().getWorkInfosForUniqueWorkLiveData(UNIQUE_WORK_KEY)
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/rfcx/ranger/service/DownLoadEventWorker.kt b/app/src/main/java/org/rfcx/ranger/service/DownLoadEventWorker.kt
index ba58c2701..db776050f 100644
--- a/app/src/main/java/org/rfcx/ranger/service/DownLoadEventWorker.kt
+++ b/app/src/main/java/org/rfcx/ranger/service/DownLoadEventWorker.kt
@@ -13,6 +13,7 @@ import okio.sink
 import org.rfcx.ranger.BuildConfig
 import org.rfcx.ranger.data.local.EventDb
 import org.rfcx.ranger.entity.event.Event
+import org.rfcx.ranger.service.CleanupAudioCacheWorker.Companion.TWO_WEEKS
 import org.rfcx.ranger.util.RealmHelper
 import retrofit2.Call
 import retrofit2.Response
@@ -21,25 +22,32 @@ import retrofit2.http.GET
 import retrofit2.http.Url
 import java.io.File
 import java.io.IOException
+import java.util.*
 import java.util.concurrent.TimeUnit
 
 class DownLoadEventWorker(context: Context, workerParams: WorkerParameters) : Worker(context, workerParams) {
-	
+	private val audioDirectory = File(context.cacheDir, AUDIOS_SUB_DIRECTORY)
 	private val needTobeDownloadEvent = arrayListOf<Event>()
 	override fun doWork(): Result {
 		Log.d(TAG, "doWork")
+		
+		if (!audioDirectory.exists()) {
+			audioDirectory.mkdir()
+		}
+		val nowDate = Date(System.currentTimeMillis())
 		val eventDb = EventDb(Realm.getInstance(RealmHelper.migrationConfig()))
 		val events = eventDb.getEventsSync()
 		needTobeDownloadEvent.clear()
 		for (event in events) {
-			val file = File(applicationContext.cacheDir, "${event.audioId}.opus")
-			if (!file.exists()) {
-				needTobeDownloadEvent.add(event)
+			if ((nowDate.time - event.beginsAt.time) <= TWO_WEEKS) {
+				val file = File(audioDirectory, "${event.audioId}.opus")
+				if (!file.exists())
+					needTobeDownloadEvent.add(event)
+			} else {
+				break
 			}
 		}
-		
 		startDownload()
-		
 		return if (needTobeDownloadEvent.isNotEmpty()) Result.retry() else Result.success()
 	}
 	
@@ -69,8 +77,8 @@ class DownLoadEventWorker(context: Context, workerParams: WorkerParameters) : Wo
 	
 	private fun saveFile(context: Context, response: Response<ResponseBody>, fileName: String,
 	                     callback: (Boolean) -> Unit) {
-		val temp = File(context.cacheDir, "$fileName _temp")
-		val file = File(context.cacheDir, fileName)
+		val temp = File(audioDirectory, "$fileName _temp")
+		val file = File(audioDirectory, fileName)
 		
 		if (file.exists()) {
 			callback.invoke(true)
@@ -106,7 +114,7 @@ class DownLoadEventWorker(context: Context, workerParams: WorkerParameters) : Wo
 	companion object {
 		private const val TAG = "DownLoadEventWorker"
 		private const val UNIQUE_WORK_KEY = "DownLoadEventWorkerUniqueKey"
-		
+		const val AUDIOS_SUB_DIRECTORY = "audios"
 		fun enqueue() {
 			val constraints = Constraints.Builder()
 					.setRequiredNetworkType(NetworkType.CONNECTED)
diff --git a/app/src/main/java/org/rfcx/ranger/util/CredentialKeeper.kt b/app/src/main/java/org/rfcx/ranger/util/CredentialKeeper.kt
index 3a354c71e..9bc72b83a 100644
--- a/app/src/main/java/org/rfcx/ranger/util/CredentialKeeper.kt
+++ b/app/src/main/java/org/rfcx/ranger/util/CredentialKeeper.kt
@@ -31,6 +31,9 @@ class CredentialKeeper(val context: Context) {
         if (user.picture != null) {
             preferences.putString(Preferences.IMAGE_PROFILE, user.picture)
         }
+        if (user.consentGivenRangerApp != null) {
+            preferences.putBoolean(Preferences.CONSENT_GIVEN, true)
+        }
         preferences.putStringSet(Preferences.ROLES, user.roles)
         preferences.putStringSet(Preferences.ACCESSIBLE_SITES, user.accessibleSites)
         if (user.defaultSite != null) {
diff --git a/app/src/main/java/org/rfcx/ranger/util/CredentialVerifier.kt b/app/src/main/java/org/rfcx/ranger/util/CredentialVerifier.kt
index 9b05d227c..67e6403ec 100644
--- a/app/src/main/java/org/rfcx/ranger/util/CredentialVerifier.kt
+++ b/app/src/main/java/org/rfcx/ranger/util/CredentialVerifier.kt
@@ -24,6 +24,7 @@ class CredentialVerifier(val context: Context) {
 		
 		// Parsing JWT Token
 		val metaDataKey = getString(R.string.auth0_metadata_key)
+		val userMetaDataKey = getString(R.string.auth0_user_metadata_key)
 		val withoutSignature = token.substring(0, token.lastIndexOf('.') + 1)
 		try {
 			val untrusted = Jwts.parser().parseClaimsJwt(withoutSignature)
@@ -64,12 +65,26 @@ class CredentialVerifier(val context: Context) {
 				}
 			}
 			
+			val userUntrusted = Jwts.parser().parseClaimsJwt(withoutSignature)
+			var consentGivenRangerApp: String? = null
+			
+			if (userUntrusted.body[userMetaDataKey] == null) {
+				consentGivenRangerApp = null
+			}
+			
+			val userMetadata = userUntrusted.body[userMetaDataKey]
+			if (userMetadata != null) {
+				if ((userMetadata is HashMap<*, *>)) {
+					consentGivenRangerApp = userMetadata["consentGivenRangerApp"] as String?
+				}
+			}
+			
 			when {
 				guid.isNullOrEmpty() -> {
 					return Err(getString(R.string.an_error_occurred))
 				}
 				else -> {
-					return Ok(UserAuthResponse(guid, email, nickname, token, credentials.accessToken, credentials.refreshToken, roles, accessibleSites, defaultSite, picture))
+					return Ok(UserAuthResponse(guid, email, nickname, token, credentials.accessToken, credentials.refreshToken, roles, accessibleSites, defaultSite, picture, consentGivenRangerApp))
 				}
 			}
 		} catch (e: Exception) {
diff --git a/app/src/main/java/org/rfcx/ranger/util/Preferences.kt b/app/src/main/java/org/rfcx/ranger/util/Preferences.kt
index dafcba503..2fde6f899 100644
--- a/app/src/main/java/org/rfcx/ranger/util/Preferences.kt
+++ b/app/src/main/java/org/rfcx/ranger/util/Preferences.kt
@@ -43,6 +43,8 @@ class Preferences(context: Context) {
 		const val IMAGE_PROFILE = "${PREFIX}IMAGE_PROFILE"
 		const val EMAIL_SUBSCRIBE = "${PREFIX}EMAIL_SUBSCRIBE"
 		const val COORDINATES_FORMAT = "${PREFIX}COORDINATES_FORMAT"
+		const val CONSENT_GIVEN = "${PREFIX}CONSENT_GIVEN"
+		const val IS_RANGER = "${PREFIX}IS_RANGER"
 	}
 	
 	init {
diff --git a/app/src/main/java/org/rfcx/ranger/view/alert/AlertBottomDialogViewModel.kt b/app/src/main/java/org/rfcx/ranger/view/alert/AlertBottomDialogViewModel.kt
index a15765e61..58ea5b4dc 100644
--- a/app/src/main/java/org/rfcx/ranger/view/alert/AlertBottomDialogViewModel.kt
+++ b/app/src/main/java/org/rfcx/ranger/view/alert/AlertBottomDialogViewModel.kt
@@ -24,6 +24,7 @@ import org.rfcx.ranger.entity.event.Confidence
 import org.rfcx.ranger.entity.event.Event
 import org.rfcx.ranger.entity.event.EventReview
 import org.rfcx.ranger.entity.event.ReviewEventFactory
+import org.rfcx.ranger.service.CleanupAudioCacheWorker.Companion.AUDIOS_SUB_DIRECTORY
 import org.rfcx.ranger.service.ReviewEventSyncWorker
 import org.rfcx.ranger.util.NetworkNotConnection
 import org.rfcx.ranger.util.getNameEmail
@@ -146,8 +147,8 @@ class AlertBottomDialogViewModel(private val context: Context,
 		} else {
 			audioUrl
 		}
-		
-		val audioFile = File(context.cacheDir, "${eventResult?.audioId}.opus")
+		val audiosDirectory = File(context.cacheDir, AUDIOS_SUB_DIRECTORY)
+		val audioFile = File(audiosDirectory, "${eventResult?.audioId}.opus")
 		val mediaSource = if (audioFile.exists()) {
 			ExtractorMediaSource.Factory(descriptorFactory).createMediaSource(Uri.fromFile(audioFile))
 		} else {
@@ -236,7 +237,7 @@ class AlertBottomDialogViewModel(private val context: Context,
 					}
 					eventDb.saveEvent(event)
 					_reviewEvent.value = Result.Success(Pair(event, requests))
-					_eventState.value = EventState.REVIEWED	// invoke state to review
+					_eventState.value = EventState.REVIEWED    // invoke state to review
 				}
 				
 			}, requests)
diff --git a/app/src/main/java/org/rfcx/ranger/view/login/InvitationCodeViewModel.kt b/app/src/main/java/org/rfcx/ranger/view/login/InvitationCodeViewModel.kt
index 19dd9bd8b..edf8a1a26 100644
--- a/app/src/main/java/org/rfcx/ranger/view/login/InvitationCodeViewModel.kt
+++ b/app/src/main/java/org/rfcx/ranger/view/login/InvitationCodeViewModel.kt
@@ -62,7 +62,7 @@ class InvitationCodeViewModel(private val context: Context, private val sendInvi
 			override fun onError(e: Throwable) {
 				callback(false)
 			}
-		}, InvitationCodeRequest(code))
+		}, InvitationCodeRequest(code, USER_ACCEPTED, APP_NAME))
 	}
 	
 	private fun refreshToken(callback: (Boolean) -> Unit) {
@@ -94,6 +94,11 @@ class InvitationCodeViewModel(private val context: Context, private val sendInvi
 			}
 		})
 	}
+	
+	companion object {
+		const val USER_ACCEPTED = "true"
+		const val APP_NAME = "RangerApp"
+	}
 }
 
 enum class SubmitState {
diff --git a/app/src/main/java/org/rfcx/ranger/view/login/LoginActivityNew.kt b/app/src/main/java/org/rfcx/ranger/view/login/LoginActivityNew.kt
index ed1b6eb34..69e08a8dc 100644
--- a/app/src/main/java/org/rfcx/ranger/view/login/LoginActivityNew.kt
+++ b/app/src/main/java/org/rfcx/ranger/view/login/LoginActivityNew.kt
@@ -33,7 +33,15 @@ class LoginActivityNew : BaseActivity(), LoginListener {
 		super.onCreate(savedInstanceState)
 		setContentView(R.layout.activity_login_new)
 		val eventGuId = getEventFromIntentIfHave(intent)
-		if (CredentialKeeper(this).hasValidCredentials() && getSiteName().isNotEmpty() && getUserNickname().substring(0, 1) != "+") {
+		
+		val preferenceHelper = Preferences.getInstance(this)
+		val isConsentGiven = preferenceHelper.getBoolean(Preferences.CONSENT_GIVEN,false)
+		
+		if(CredentialKeeper(this).hasValidCredentials() && !isConsentGiven) {
+			supportFragmentManager.beginTransaction()
+					.add(loginContainer.id, TermsAndServiceFragment(),
+							"TermsAndServiceFragment").commit()
+		} else if (CredentialKeeper(this).hasValidCredentials() && getSiteName().isNotEmpty() && getUserNickname().substring(0, 1) != "+") {
 			MainActivityNew.startActivity(this@LoginActivityNew, eventGuId)
 			finish()
 		} else {
@@ -77,6 +85,13 @@ class LoginActivityNew : BaseActivity(), LoginListener {
 		
 	}
 	
+	override fun openTermsAndServiceFragment() {
+		supportFragmentManager.beginTransaction()
+				.replace(loginContainer.id, TermsAndServiceFragment(),
+						"TermsAndServiceFragment").commit()
+		
+	}
+	
 	private fun getEventFromIntentIfHave(intent: Intent?) :String? {
 		if (intent?.hasExtra("event_guid") == true) {
 			return intent.getStringExtra("event_guid")
@@ -89,4 +104,5 @@ interface LoginListener {
 	fun openMain()
 	fun openInvitationCodeFragment()
 	fun openSetUserNameFragmentFragment()
+	fun openTermsAndServiceFragment()
 }
diff --git a/app/src/main/java/org/rfcx/ranger/view/login/LoginFragment.kt b/app/src/main/java/org/rfcx/ranger/view/login/LoginFragment.kt
index 824cfe5eb..fd8db0b7d 100644
--- a/app/src/main/java/org/rfcx/ranger/view/login/LoginFragment.kt
+++ b/app/src/main/java/org/rfcx/ranger/view/login/LoginFragment.kt
@@ -90,8 +90,8 @@ class LoginFragment : BaseFragment() {
 		loginViewModel.redirectPage.observe(this, Observer { loginRedirect ->
 			when (loginRedirect) {
 				LoginRedirect.MAIN_PAGE -> listener.openMain()
-				LoginRedirect.INVITE_CODE_PAGE -> listener.openInvitationCodeFragment()
 				LoginRedirect.SET_USER_NAME -> listener.openSetUserNameFragmentFragment()
+				LoginRedirect.TERMS_AND_SERVICE -> listener.openTermsAndServiceFragment()
 				else -> loading(false)
 			}
 		})
diff --git a/app/src/main/java/org/rfcx/ranger/view/login/LoginViewModel.kt b/app/src/main/java/org/rfcx/ranger/view/login/LoginViewModel.kt
index d073adfe1..25fb593e1 100644
--- a/app/src/main/java/org/rfcx/ranger/view/login/LoginViewModel.kt
+++ b/app/src/main/java/org/rfcx/ranger/view/login/LoginViewModel.kt
@@ -159,18 +159,25 @@ class LoginViewModel(private val context: Context, private val checkUserTouchUse
 //	}
 	
 	fun checkUserDetail(userAuthResponse: UserAuthResponse) {
+		val preferenceHelper = Preferences.getInstance(context)
 		CredentialKeeper(context).save(userAuthResponse)
 		
 		checkUserTouchUseCase.execute(object : DisposableSingleObserver<Boolean>() {
 			override fun onSuccess(t: Boolean) {
+				val isConsentGiven = preferenceHelper.getBoolean(Preferences.CONSENT_GIVEN)
+				
 				if (userAuthResponse.isRanger) {
-					if (context.getUserNickname().substring(0, 1) == "+") {
+					preferenceHelper.putBoolean(Preferences.IS_RANGER, true)
+					if (!isConsentGiven) {
+						_redirectPage.postValue(LoginRedirect.TERMS_AND_SERVICE)
+					} else if (context.getUserNickname().substring(0, 1) == "+") {
 						_redirectPage.postValue(LoginRedirect.SET_USER_NAME)
 					} else {
 						_redirectPage.postValue(LoginRedirect.MAIN_PAGE)
 					}
 				} else {
-					_redirectPage.postValue(LoginRedirect.INVITE_CODE_PAGE)
+					preferenceHelper.putBoolean(Preferences.IS_RANGER, false)
+					_redirectPage.postValue(LoginRedirect.TERMS_AND_SERVICE)
 				}
 			}
 			
@@ -183,5 +190,5 @@ class LoginViewModel(private val context: Context, private val checkUserTouchUse
 }
 
 enum class LoginRedirect {
-	MAIN_PAGE, INVITE_CODE_PAGE, SET_USER_NAME
+	MAIN_PAGE, SET_USER_NAME, TERMS_AND_SERVICE
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/rfcx/ranger/view/login/TermsAndServiceFragment.kt b/app/src/main/java/org/rfcx/ranger/view/login/TermsAndServiceFragment.kt
new file mode 100644
index 000000000..d4d12c208
--- /dev/null
+++ b/app/src/main/java/org/rfcx/ranger/view/login/TermsAndServiceFragment.kt
@@ -0,0 +1,69 @@
+package org.rfcx.ranger.view.login
+
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.lifecycle.Observer
+import kotlinx.android.synthetic.main.fragment_terms_and_service.*
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.rfcx.ranger.R
+import org.rfcx.ranger.data.remote.success
+import org.rfcx.ranger.util.Preferences
+import org.rfcx.ranger.view.MainActivityNew
+import org.rfcx.ranger.view.base.BaseFragment
+
+class TermsAndServiceFragment : BaseFragment() {
+	lateinit var listener: LoginListener
+	private val termsAndServiceViewModel: TermsAndServiceViewModel by viewModel()
+	
+	override fun onAttach(context: Context) {
+		super.onAttach(context)
+		listener = (context as LoginListener)
+	}
+	
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+	                          savedInstanceState: Bundle?): View? {
+		return inflater.inflate(R.layout.fragment_terms_and_service, container, false)
+	}
+	
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+		
+		termsAndConditionsWebview.loadUrl("https://rfcx.org/terms-of-service-ranger-app-text-only")
+		
+		checkBox.setOnClickListener {
+			submitButton.isEnabled = checkBox.isChecked
+		}
+		
+		submitButton.setOnClickListener {
+			val preferenceHelper = context?.let { it1 -> Preferences.getInstance(it1) }
+			val isRanger = preferenceHelper?.getBoolean(Preferences.IS_RANGER, false)
+	
+			if (isRanger != null) {
+				if(isRanger){
+					termsAndServiceViewModel.acceptTerms()
+				} else {
+					listener.openInvitationCodeFragment()
+				}
+			}
+			
+			termsAndServiceViewModel.consentGivenState.observe(this, Observer {
+				it.success({ state ->
+					if (state) {
+						context?.let { it1 -> MainActivityNew.startActivity(it1, null) }
+					}
+				}, {
+					termsProgressBar.visibility = View.GONE
+					submitButton.visibility = View.VISIBLE
+					
+				}, {
+					termsProgressBar.visibility = View.VISIBLE
+					submitButton.visibility = View.INVISIBLE
+				})
+			})
+		}
+	}
+}
diff --git a/app/src/main/java/org/rfcx/ranger/view/login/TermsAndServiceViewModel.kt b/app/src/main/java/org/rfcx/ranger/view/login/TermsAndServiceViewModel.kt
new file mode 100644
index 000000000..271052b24
--- /dev/null
+++ b/app/src/main/java/org/rfcx/ranger/view/login/TermsAndServiceViewModel.kt
@@ -0,0 +1,89 @@
+package org.rfcx.ranger.view.login
+
+import android.content.Context
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.auth0.android.Auth0
+import com.auth0.android.authentication.AuthenticationAPIClient
+import com.auth0.android.authentication.AuthenticationException
+import com.auth0.android.callback.BaseCallback
+import com.auth0.android.result.Credentials
+import io.reactivex.observers.DisposableSingleObserver
+import org.rfcx.ranger.R
+import org.rfcx.ranger.data.remote.Result
+import org.rfcx.ranger.data.remote.terms.TermsUseCase
+import org.rfcx.ranger.entity.Err
+import org.rfcx.ranger.entity.Ok
+import org.rfcx.ranger.entity.terms.TermsRequest
+import org.rfcx.ranger.entity.terms.TermsResponse
+import org.rfcx.ranger.util.CredentialKeeper
+import org.rfcx.ranger.util.CredentialVerifier
+import org.rfcx.ranger.util.Preferences
+import org.rfcx.ranger.util.getResultError
+
+class TermsAndServiceViewModel(private val context: Context, private val termsUseCase: TermsUseCase) : ViewModel() {
+	
+	private val auth0 by lazy {
+		val auth0 = Auth0(context.getString(R.string.auth0_client_id), context.getString(R.string.auth0_domain))
+		//auth0.isLoggingEnabled = true
+		auth0.isOIDCConformant = true
+		auth0
+	}
+	
+	private val authentication by lazy {
+		AuthenticationAPIClient(auth0)
+	}
+	
+	private val _consentGivenState = MutableLiveData<Result<Boolean>>()
+	val consentGivenState: LiveData<Result<Boolean>> get() = _consentGivenState
+	
+	fun acceptTerms() {
+		_consentGivenState.value = Result.Loading
+		
+		termsUseCase.execute(object : DisposableSingleObserver<TermsResponse>() {
+			override fun onSuccess(t: TermsResponse) {
+				if (t.success) {
+					refreshToken {
+						if (it) {
+							_consentGivenState.postValue(Result.Success(true))
+						}
+					}
+				}
+			}
+			
+			override fun onError(e: Throwable) {
+				_consentGivenState.value = e.getResultError()
+			}
+		}, TermsRequest("RangerApp"))
+	}
+	
+	private fun refreshToken(callback: (Boolean) -> Unit) {
+		val refreshToken = Preferences.getInstance(context).getString(Preferences.REFRESH_TOKEN)
+		if (refreshToken == null) {
+			callback(false)
+			return
+		}
+		
+		authentication.renewAuth(refreshToken).start(object : BaseCallback<Credentials, AuthenticationException> {
+			override fun onSuccess(credentials: Credentials) {
+				when (val result = CredentialVerifier(context).verify(credentials)) {
+					is Err -> {
+						callback(false)
+					}
+					is Ok -> {
+						val userAuthResponse = result.value
+						if (userAuthResponse.isRanger) {
+							CredentialKeeper(context).save(userAuthResponse)
+						}
+						callback(userAuthResponse.isRanger)
+					}
+				}
+			}
+			
+			override fun onFailure(error: AuthenticationException) {
+				callback(false)
+			}
+		})
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/rfcx/ranger/view/report/ReportActivity.kt b/app/src/main/java/org/rfcx/ranger/view/report/ReportActivity.kt
index 917947fb7..2a8d4d8fa 100644
--- a/app/src/main/java/org/rfcx/ranger/view/report/ReportActivity.kt
+++ b/app/src/main/java/org/rfcx/ranger/view/report/ReportActivity.kt
@@ -16,6 +16,7 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.ScrollView
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.databinding.DataBindingUtil
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -44,6 +45,7 @@ import java.io.File
 import java.io.IOException
 import java.util.*
 import org.rfcx.ranger.databinding.ActivityReportBinding
+import kotlin.concurrent.timerTask
 
 
 class ReportActivity : BaseReportImageActivity(), OnMapReadyCallback {
@@ -59,6 +61,8 @@ class ReportActivity : BaseReportImageActivity(), OnMapReadyCallback {
 	private var lastLocation: Location? = null
 	private val analytics by lazy { Analytics(this) }
 	
+	private val waitingForLocationTimer: Timer = Timer()
+	
 	private lateinit var binding: ActivityReportBinding
 	
 	private fun bitmapDescriptorFromVector(context: Context, vectorResId: Int): BitmapDescriptor? {
@@ -127,6 +131,7 @@ class ReportActivity : BaseReportImageActivity(), OnMapReadyCallback {
 			supportFragmentManager.beginTransaction().remove(it).commitAllowingStateLoss()
 		}
 		stopPlaying()
+		waitingForLocationTimer.cancel()
 	}
 	
 	override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -215,14 +220,31 @@ class ReportActivity : BaseReportImageActivity(), OnMapReadyCallback {
 		if (isDestroyed) return
 		locationManager?.removeUpdates(locationListener)
 		locationManager = getSystemService(Context.LOCATION_SERVICE) as LocationManager?
+		waitingForLocationTimer.schedule(timerTask {
+			if (lastLocation == null) {
+				runOnUiThread {
+					showLocationMessageError(getString(R.string.in_air_plane_mode))
+					AlertDialog.Builder(this@ReportActivity)
+							.setTitle(null)
+							.setMessage("${getString(R.string.in_air_plane_mode)}. ${getString(R.string.please_try_again_later)}")
+							.setCancelable(true)
+							.setPositiveButton(R.string.button_ok) { dialog, _ ->
+								dialog.dismiss()
+								finish()
+							}.show()
+				}
+			}
+		}, 30 * 1000) // waiting for 30 sec if cannot get location show error
 		try {
 			locationManager?.requestLocationUpdates(LocationManager.GPS_PROVIDER, 5 * 1000L, 0f, locationListener)
 			lastLocation = locationManager?.getLastKnownLocation(LocationManager.GPS_PROVIDER)
 			showLocationFinding()
 			lastLocation?.let { markRangerLocation(it) }
 		} catch (ex: SecurityException) {
+			showLocationMessageError(getString(R.string.in_air_plane_mode))
 			ex.printStackTrace()
 		} catch (ex: IllegalArgumentException) {
+			showLocationMessageError(getString(R.string.in_air_plane_mode))
 			ex.printStackTrace()
 		}
 		
diff --git a/app/src/main/res/layout/fragment_terms_and_service.xml b/app/src/main/res/layout/fragment_terms_and_service.xml
new file mode 100644
index 000000000..cde272683
--- /dev/null
+++ b/app/src/main/res/layout/fragment_terms_and_service.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	tools:context=".view.login.TermsAndServiceFragment">
+	
+	<androidx.constraintlayout.widget.ConstraintLayout
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:clickable="true"
+		android:focusable="true"
+		android:focusableInTouchMode="true"
+		android:paddingBottom="@dimen/margin_padding_normal">
+		
+		<WebView
+			android:id="@+id/termsAndConditionsWebview"
+			android:layout_width="0dp"
+			android:layout_height="0dp"
+			android:layout_margin="@dimen/margin_padding_normal"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintBottom_toTopOf="@id/checkBox"/>
+		
+		<CheckBox
+			android:id="@+id/checkBox"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_margin="@dimen/margin_padding_normal"
+			app:layout_constraintStart_toStartOf="parent"
+			android:text="@string/terms_and_service"
+			app:layout_constraintBottom_toTopOf="@id/submitButton"/>
+		
+		<androidx.appcompat.widget.AppCompatButton
+			android:id="@+id/submitButton"
+			style="@style/RangerButton.GreenButton"
+			android:layout_width="0dp"
+			android:layout_height="@dimen/button_height"
+			android:layout_marginStart="@dimen/margin_padding_normal"
+			android:layout_marginEnd="@dimen/margin_padding_normal"
+			android:layout_marginBottom="@dimen/margin_padding_normal"
+			android:text="@string/continue_text"
+			android:enabled="false"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintBottom_toBottomOf="parent"/>
+		
+		<ProgressBar
+			android:id="@+id/termsProgressBar"
+			android:layout_width="wrap_content"
+			android:layout_height="@dimen/button_height"
+			android:layout_gravity="center"
+			android:background="@color/transparent"
+			android:layout_marginBottom="@dimen/margin_padding_normal"
+			android:visibility="gone"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintBottom_toBottomOf="parent" />
+		
+	</androidx.constraintlayout.widget.ConstraintLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 6df68a946..e412e4095 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -28,6 +28,15 @@
 	<string name="create_new_reports">Crear nuevos informes</string>
 	<string name="view_reports">Ver informes de ubicación</string>
 	<string name="app_intro">Aplicación Introducción</string>
+	<string name="coordinates">Coordenadas</string>
+	
+	<string name="dd_coordinates">DD</string>
+	<string name="ddm_coordinates">DDM</string>
+	<string name="dms_coordinates">DMS</string>
+	
+	<string name="dd_coordinates_format">0.00000°N 0.00000°E</string>
+	<string name="ddm_coordinates_format">0°0.0000\'N 0°0.0000\'E</string>
+	<string name="dms_coordinates_format">0°0\'0.0\"N 0°0\'0.0\"E</string>
 	
 	<!--new Login Activite-->
 	<string name="login_sign_in_button_label">Entrar</string>
@@ -37,6 +46,9 @@
 	<string name="please_tell_name">Por favor, díganos su nombre</string>
 	<string name="hint_name">Nombre</string>
 	
+	<string name="terms_and_service">He leído y estoy de acuerdo con estos Términos y Servicio</string>
+	<string name="continue_text">Seguir</string>
+	
 	<!-- common error -->
 	<string name="error_common">Un error ha ocurrido. Por favor intente de nuevo.</string>
 	<string name="location_permission_msg">A Ranger App le gustaría usar tu ubicación</string>
@@ -236,6 +248,7 @@
 	<string name="password_changed_successfully">La contraseña ha sido cambiada con éxito.</string>
 	<string name="something_is_wrong">Algo salió mal. Por favor, inténtelo de nuevo más tarde.</string>
 	<string name="account">Cuenta</string>
+	<string name="please_try_again_later">inténtelo de nuevo más tarde</string>
 	
 	<string name="change_profile_photo">Cambio de perfil de fotos</string>
 	<string name="edit_profile">Editar perfil</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index e6b893934..6db3fcafc 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -28,6 +28,15 @@
     <string name="create_new_reports">Membuat laporan baru</string>
     <string name="view_reports">Lihat laporan berdasarkan lokasi</string>
     <string name="app_intro">App Intro</string>
+    <string name="coordinates">Koordinat</string>
+    
+    <string name="dd_coordinates">DD</string>
+    <string name="ddm_coordinates">DDM</string>
+    <string name="dms_coordinates">DMS</string>
+    
+    <string name="dd_coordinates_format">0.00000°N 0.00000°E</string>
+    <string name="ddm_coordinates_format">0°0.0000\'N 0°0.0000\'E</string>
+    <string name="dms_coordinates_format">0°0\'0.0\"N 0°0\'0.0\"E</string>
     
     <!--new Login Activite-->
     <string name="login_sign_in_button_label">Masuk</string>
@@ -37,6 +46,9 @@
     <string name="please_tell_name">Silakan beritahu kami nama Anda</string>
     <string name="hint_name">Nama</string>
     
+    <string name="terms_and_service">Saya telah membaca dan menyetujui Syarat dan Layanan</string>
+    <string name="continue_text">Terus</string>
+    
     <!-- common error -->
     <string name="error_common">terjadi kesalahan, silahkan coba lagi</string>
     <string name="location_permission_msg">Aplikasi Ranger ingin menggunakan lokasi Anda</string>
@@ -236,6 +248,7 @@
     <string name="password_changed_successfully">Password telah berhasil diubah.</string>
     <string name="something_is_wrong">Ada yang salah. Silakan coba lagi nanti.</string>
     <string name="account">Akun</string>
+    <string name="please_try_again_later">Silakan coba lagi nanti</string>
     
     <string name="change_profile_photo">Ganti foto profil</string>
     <string name="edit_profile">Sunting profil</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
new file mode 100644
index 000000000..d79031643
--- /dev/null
+++ b/app/src/main/res/values-nl/strings.xml
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<!-- LoginActivity -->
+	<string name="email">E-mail</string>
+	<string name="password">Wachtwoord</string>
+	<string name="login">Log in</string>
+	<string name="connect_with_facebook">Verbinden met Facebook</string>
+	<string name="connect_with_sms">Ga verder met telefoonnummer</string>
+	<string name="pls_fill_email">Vul e-mail</string>
+	<string name="pls_fill_password">Vul wachtwoord</string>
+	<string name="incorrect_username_password">foute gebruikersnaam of wachtwoord</string>
+	<string name="an_error_occurred">Service onbeschikbaar</string>
+	<string name="or">OF</string>
+	<string name="powered_by">Aangedreven door</string>
+	
+	<!-- LoginActivity -->
+	<string name="next">De volgende</string>
+	<string name="skip">Overspringen</string>
+	<string name="done">Gedaan</string>
+	<string name="available_in_settings">U vindt er ook deze les in het tabblad Profile</string>
+	<string name="name_of_guardian">Naam van de voogd</string>
+	<string name="enable_tracking_when">Schakel het volgen als je op patrouille om uw positie te melden</string>
+	<string name="when_the_event">Wanneer de gebeurtenis gedetecteerd</string>
+	<string name="number_of_reviews">Aantal bevestigde beoordelingen</string>
+	<string name="boxes_indicate_possible">Vakjes geven mogelijke kettingzaag gebeurtenissen</string>
+	<string name="confirm_it">Bevestigen dat het een kettingzaag</string>
+	<string name="reject_it">Weigeren het is niet een kettingzaag</string>
+	<string name="create_new_reports">Maak nieuwe rapporten</string>
+	<string name="view_reports">Rapporten te bekijken per locatie</string>
+	<string name="app_intro">App intro</string>
+	<string name="coordinates">Coördinaten</string>
+	
+	<!--new Login Activite-->
+	<string name="login_sign_in_button_label">Inloggen</string>
+	<string name="invitation_submit_button_label">voorleggen</string>
+	
+	<string name="what_we_call_you">Wat moeten we je bellen?</string>
+	<string name="please_tell_name">Vertel ons uw naam</string>
+	<string name="hint_name">Naam</string>
+	
+	<string name="terms_and_service">Ik heb gelezen en ga akkoord met deze voorwaarden en service</string>
+	<string name="continue_text">Doorgaan met</string>
+	
+	<!-- common error -->
+	<string name="error_common">Er is een fout opgetreden. Probeer het opnieuw.</string>
+	<string name="location_permission_msg">Ranger App wilt uw locatie te gebruiken</string>
+	<string name="record_audio_permission_msg">Ranger App willen audio op te nemen</string>
+	<string name="camera_permission_msg">Ranger App wilt uw camera te gebruiken</string>
+	<string name="read_storage_permission_msg">Ranger App wilt uw camera te gebruiken</string>
+	<string name="go_to_setting">instellingen</string>
+	
+	<!-- message list -->
+	<string name="profile_welcome">Hi, %s!</string>
+	<string name="profile_onduty">In functie</string>
+	<string name="profile_nottracking">Niet volgen</string>
+	<string name="error_no_guardian_group_set">Set voogd groep in Instellingen</string>
+	<string name="please_set_guardian_group">Gelieve set voogd groep</string>
+	<string name="sent_to">verzenden naar</string>
+	
+	<!-- report -->
+	<string name="report_title">Verslag doen van</string>
+	<string name="report_what_label">WAT?</string>
+	<string name="report_when_label">WANNEER?</string>
+	<string name="report_submit_button_label">voorleggen</string>
+	<string name="report_record_label">RECORD\'S (Optioneel)</string>
+	<string name="report_attach_image_label">FOTO (optioneel)</string>
+	<string name="report_location_null">Locatie is niet gevonden. Probeer het opnieuw.</string>
+	<string name="report_note_label">Notes (optioneel)</string>
+	<string name="report_note">Notes</string>
+	<string name="report_note_hint">Doe wat aantekeningen hier</string>
+	<string name="some_photo_already_exists">Sommige foto bestaat al</string>
+	<string name="these_photos_already_exists">Deze foto\'s bestaan</string>
+	<string name="this_photo_already_exists">Deze foto bestaat al</string>
+	<string name="expires_in_24h">loopt af in 24 uur</string>
+	
+	<!-- Notification -->
+	<string name="notification_location_loading">Laden locatie…</string>
+	<string name="notification_location_not_availability">Schakel de locatie-instellingen van uw apparaat in</string>
+	
+	<!-- Settings -->
+	<string name="dialog_loading">Bezig met laden…</string>
+	<string name="location_tracking_label">Location tracking</string>
+	<string name="location_tracking_on_label">Aan</string>
+	<string name="location_tracking_off_label">Uit</string>
+	<string name="default_site_label">Plaats</string>
+	<string name="guardian_group_label">Guardian groep</string>
+	<string name="notifications">Meldingen</string>
+	
+	<string name="dd_coordinates">DD</string>
+	<string name="ddm_coordinates">DDM</string>
+	<string name="dms_coordinates">DMS</string>
+	
+	<string name="dd_coordinates_format">0.00000°N 0.00000°E</string>
+	<string name="ddm_coordinates_format">0°0.0000\'N 0°0.0000\'E</string>
+	<string name="dms_coordinates_format">0°0\'0.0\"N 0°0\'0.0\"E</string>
+	
+	<string name="last_month">Laatste \nMonth</string>
+	<string name="last_week">Laatste \nWeek</string>
+	<string name="last_24_hours">Laatste \n24 uur</string>
+	<string name="now">Nu</string>
+	<string name="within_month">Binnen een maand</string>
+	<string name="within_week">Binnen een week</string>
+	<string name="within_24_hours">Binnen 24 uur</string>
+	<string name="at_that_time">Op dat moment</string>
+	
+	<string name="tab_to_record_label">Houd de knop om op te nemen notities</string>
+	<string name="new_password">Nieuw paswoord</string>
+	<string name="new_password_again">Bevestig nieuw wachtwoord</string>
+	<string name="change_password">Verander wachtwoord</string>
+	
+	<!-- Invitation -->
+	<string name="invitation_title">Verbinding maken met een website</string>
+	<string name="invitation_desc">Vul hier uw uitnodiging code</string>
+	<string name="hint_code">Code</string>
+	<string name="invalid_invite_code">Ongeldige code uit te nodigen</string>
+	
+	<!-- Report -->
+	<string name="sync_reports_label">%d meldingen</string>
+	<string name="sync_report_label">%d rapport</string>
+	<string name="sync_checkins_label">%d locatie inchecken</string>
+	<string name="sync_waiting_network">Wachten op het netwerk…</string>
+	<string name="sync_starting">beginnen uploaden…</string>
+	<string name="sync_uploading">uploaden…</string>
+	<string name="sync_complete">Upload compleet!</string>
+	<string name="empty_list_description">"Er waren geen incidenten onlangs. \nGeniet van je dag :)"</string>
+	<string name="can_not_play_audio">Kan geen audio te spelen, probeer het later opnieuw.</string>
+	
+	<string name="menu_camera">Camera</string>
+	<string name="menu_gallery">Galerij</string>
+	
+	<!-- Report list -->
+	<string name="report_list_title">verslag Geschiedenis</string>
+	<string name="report_list_empty_message">Je hebt geen rapporten</string>
+	<string name="images_sync_format">%d foto\'s (gesynchroniseerd)</string>
+	<string name="images_unsync_format">%1d\'s (%2d-gesynchroniseerde)</string>
+	<string name="report_detail_title">rapport detail</string>
+	
+	<string name="in_air_plane_mode">Kan uw locatie te bepalen</string>
+	<string name="pls_off_air_plane_mode">Schakel de vliegtuigmodus uit</string>
+	
+	<string name="location">Plaats</string>
+	<string name="photos">Foto\'s</string>
+	<string name="audio_notes">audio notities</string>
+	
+	<string name="menu_status">TOESTAND</string>
+	<string name="menu_map">KAART</string>
+	<string name="menu_alert">ALERT</string>
+	<string name="menu_profile">PROFIEL</string>
+	
+	<string name="see_report_detail">Zie detail</string>
+	<string name="report_time_second">Net nu</string>
+	<string name="report_minutes_format">%dm</string>
+	<string name="report_hr_format">%dh</string>
+	<string name="report_day_format">%dd</string>
+	<string name="report_week_format">%dw</string>
+	<string name="follow_up_later_button">Follow-up later</string>
+	<string name="open_map_button">Open kaart</string>
+	
+	<string name="common_ok">OK</string>
+	<string name="common_no">Nee</string>
+	<string name="common_yes">Ja</string>
+	<string name="common_none">Geen</string>
+	
+	<!-- Status -->
+	<string name="status_stat_title">Uw wekelijkse-status</string>
+	<string name="status_report_title">Rapport geschiedenis</string>
+	<string name="status_alert_title">Recente alerts</string>
+	<string name="status_see_more">Bekijk meer</string>
+	<string name="status_duty_count_desc">minuten op plicht</string>
+	<string name="status_reported_desc">ingediende verslagen</string>
+	<string name="status_reviewed_desc">alert beoordeeld</string>
+	<string name="format_location">%s, %s</string>
+	<string name="format_image_synced">%s foto</string>
+	<string name="format_image_unsync">%s foto (%s nog niet gesynchroniseerd)</string>
+	<string name="format_images_synced">%s foto\'s</string>
+	<string name="format_images_unsync">%s foto\'s (%s nog niet gesynchroniseerd)</string>
+	<string name="empty_report_text">Geen rapporten in de afgelopen 7 dagen. \ndruk op + om er een te maken.</string>
+	<string name="guardian_group_not_found">Guardian groep niet gevonden. Je moet een groep in en ontvang meldingen te stellen!</string>
+	
+	<string name="button_later">Later</string>
+	<string name="button_set_guardian_group">Stel Guardian Group in</string>
+	
+	<!-- Override string res from matisse Image picker library -->
+	<string name="album_name_all">Alle Media</string>
+	<string name="button_preview">Voorbeeld</string>
+	<string name="button_apply_default">Toepassen</string>
+	<string name="button_apply">Toepassen(%1$d)</string>
+	<string name="button_back">Terug</string>
+	<string name="photo_grid_capture">Camera</string>
+	<string name="empty_text">Nog geen media</string>
+	<string name="button_ok">OK</string>
+	<string name="error_over_count_default">Je hebt max selecteerbare bereikt</string>
+	<string name="error_over_count">U kunt alleen selecteert maximaal %1$d mediabestanden</string>
+	<string name="error_under_quality">Onder kwaliteit</string>
+	<string name="error_over_quality">Over kwaliteit</string>
+	<string name="error_file_type">Niet ondersteund bestandstype</string>
+	<string name="error_type_conflict">Kan geen foto\'s en video\'s tegelijk selecteren</string>
+	<string name="error_no_video_activity">Geen App gevonden ter ondersteuning van video preview</string>
+	<string name="error_over_original_size">Kan de foto\'s die groter zijn dan %1$d MB niet selecteren</string>
+	<string name="error_over_original_count">%1$d foto\'s meer dan %2$d MB. Original zal uitgevinkt</string>
+	<string name="button_original">origineel</string>
+	<string name="button_sure_default">OK</string>
+	<string name="button_sure">OK(%1$d)</string>
+	<!-- Override string res from matisse Image picker library -->
+	
+	<!-- Alerts -->
+	<string name="tab_group_by_guardians">Door Guardian</string>
+	<string name="tab_all_alerts">Alle waarschuwingen</string>
+	<string name="yesterday">Gisteren</string>
+	<string name="no_internet_connection">Geen internet, probeer het opnieuw.</string>
+	<string name="warning_set_guardian_group">Guardian groep niet gevonden. Je moet een groep in en ontvang meldingen te stellen!</string>
+	<string name="no_incident_occurred_recently">Er is geen invallend Onlangs hebben zich</string>
+	<string name="enjoy_you_day">Geniet van je dag :)</string>
+	<string name="see_older">Zie Oudere</string>
+	<string name="not_have_event_more">Er is geen evenementen meer</string>
+	<string name="last_reviewed_by">Laatst beoordeeld door</string>
+	<string name="not_have_review">Nog niet beoordeeld</string>
+	
+	<!--Event value-->
+	<string name="chainsaw">kettingzaag</string>
+	<string name="gunshot">geweerschot</string>
+	<string name="vehicle">voertuig</string>
+	<string name="trespasser">overtreder</string>
+	<string name="other">anders</string>
+	
+	<!--Profile -->
+	<string name="profile_receive_noti_label">door pushmelding</string>
+	<string name="profile_receive_noti_by_email">per email</string>
+	<string name="profile_sign_out_label">Afmelden</string>
+	<string name="please_enter_your_new_password">Vul uw nieuwe wachtwoord</string>
+	<string name="please_confirm_your_new_password">Bevestig uw nieuwe wachtwoord</string>
+	<string name="password_must_have_at_least_6_characters">Wachtwoord moet minimaal 6 tekens</string>
+	<string name="confirm_password_does_not_match">Bevestig wachtwoord komt niet overeen</string>
+	<string name="password_changed_successfully">Het wachtwoord is gewijzigd.</string>
+	<string name="something_is_wrong">Er is iets fout gegaan. Probeer het later opnieuw.</string>
+	<string name="profile_aditional_label">Extra</string>
+	<string name="profile_app_version_label">App versie</string>
+	<string name="profile_feedback_label">Terugkoppeling</string>
+	<string name="profile_rate_app_label">Beoordeel de app</string>
+	<string name="save_changed">Wijzigingen opslaan</string>
+	<string name="please_try_again_later">Probeer het later opnieuw.</string>
+	
+	<string name="feedback_submitted">Terugkoppeling ingediend. Bedankt voor je tijd :)</string>
+	<string name="feedback_submission_failed">Indienen van gebruikersfeedback mislukt! Probeer het opnieuw.</string>
+	<string name="snackbar_retry">Opnieuw</string>
+	<string name="profile_send_feedback">Feedback sturen</string>
+	<string name="from">Van:</string>
+	<string name="app_feedback_share_ideas">Laat app feedback of deel uw ideeën</string>
+	<string name="maximum_number_of_attachments">Je hebt max selecteerbare bereikt. Probeer het verwijderen van een aantal items voor het toevoegen van meer bijlagen.</string>
+	<string name="account">Account</string>
+	
+	<string name="change_profile_photo">Profiel wijzigen Photo</string>
+	<string name="edit_profile">Bewerk profiel</string>
+	
+	<!--Guardian Group List-->
+	<string name="guardian_group_list">Guardian Group List</string>
+	
+	<string name="notification_tracking_title">On-plicht en bijhouden heeft ingeschakeld</string>
+	<string name="notification_traking_message_format">%d minuten geregistreerd</string>
+	
+	<string name="reject_text">afwijzen</string>
+	<string name="confirm_text">bevestigen</string>
+	<string name="required">Verplicht!</string>
+	<string name="error_unsubscribe_by_email">Afmelden voor %s mislukt.</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 86989e16b..a8e8d9a59 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -28,6 +28,15 @@
     <string name="create_new_reports">Criar novos relatórios</string>
     <string name="view_reports">Visualizar relatórios por localização</string>
     <string name="app_intro">App Intro</string>
+    <string name="coordinates">Coordenadas</string>
+    
+    <string name="dd_coordinates">DD</string>
+    <string name="ddm_coordinates">DDM</string>
+    <string name="dms_coordinates">DMS</string>
+    
+    <string name="dd_coordinates_format">0.00000°N 0.00000°E</string>
+    <string name="ddm_coordinates_format">0°0.0000\'N 0°0.0000\'E</string>
+    <string name="dms_coordinates_format">0°0\'0.0\"N 0°0\'0.0\"E</string>
     
     <!--new Login Activite-->
     <string name="login_sign_in_button_label">Assinar em </string>
@@ -37,6 +46,9 @@
     <string name="please_tell_name">Por favor, diga-nos o seu nome</string>
     <string name="hint_name">Nome</string>
     
+    <string name="terms_and_service">Eu li e concordo com os Termos e Serviço</string>
+    <string name="continue_text">Continuar</string>
+    
     <!-- common error -->
     <string name="error_common">Ocorreu um erro. Por favor, tente de novo.</string>
     <string name="location_permission_msg">O aplicativo Ranger gostaria de usar sua localização</string>
@@ -236,6 +248,7 @@
     <string name="password_changed_successfully">A senha foi alterada com sucesso.</string>
     <string name="something_is_wrong">Algo deu errado. Por favor, tente novamente mais tarde.</string>
     <string name="account">Conta</string>
+    <string name="please_try_again_later">tente novamente mais tarde.</string>
     
     <string name="change_profile_photo">Alterar foto do perfil</string>
     <string name="edit_profile">Editar Perfil</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 99b4908b5..71758d518 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -28,7 +28,15 @@
     <string name="create_new_reports">สร้างรายงานใหม่</string>
     <string name="view_reports">ดูรายงานตามพื้นที่</string>
     <string name="app_intro">คู่มือการใช้งานแอป</string>
+    <string name="coordinates">รูปแบบพิกัด GPS</string>
     
+    <string name="dd_coordinates">DD</string>
+    <string name="ddm_coordinates">DDM</string>
+    <string name="dms_coordinates">DMS</string>
+    
+    <string name="dd_coordinates_format">0.00000°N 0.00000°E</string>
+    <string name="ddm_coordinates_format">0°0.0000\'N 0°0.0000\'E</string>
+    <string name="dms_coordinates_format">0°0\'0.0\"N 0°0\'0.0\"E</string>
     <!--new Login Activite-->
     <string name="login_sign_in_button_label">เข้าสู่ระบบ</string>
     <string name="invitation_submit_button_label">บันทึก</string>
@@ -37,6 +45,9 @@
     <string name="please_tell_name">กรุณาบอกชื่อคุณกับเรา</string>
     <string name="hint_name">ชื่อ</string>
     
+    <string name="terms_and_service">ข้าพเจ้าได้อ่านและยอมรับข้อกำหนดและบริการดังกล่าว</string>
+    <string name="continue_text">ถัดไป</string>
+    
     <!-- common error -->
     <string name="error_common">เกิดข้อผิดพลาด กรุณาลองใหม่อีกครั้ง</string>
     <string name="location_permission_msg">แอป Ranger ต้องการใช้ตำแหน่งของคุณ</string>
@@ -235,6 +246,7 @@
     <string name="password_changed_successfully">การเปลี่ยนรหัสผ่านสำเร็จ</string>
     <string name="something_is_wrong">มีบางอย่างผิดพลาด กรุณาลองใหม่อีกครั้ง</string>
     <string name="account">บัญชีผู้ใช้</string>
+    <string name="please_try_again_later">มีบางอย่างผิดพลาด กรุณาลองใหม่อีกครั้ง</string>
     
     <string name="change_profile_photo">เปลี่ยนรูปโปรไฟล์</string>
     <string name="edit_profile">แก้ไขโปรไฟล์</string>
diff --git a/app/src/main/res/values/environment.xml b/app/src/main/res/values/environment.xml
index ed63e8255..a924bfd0c 100644
--- a/app/src/main/res/values/environment.xml
+++ b/app/src/main/res/values/environment.xml
@@ -8,6 +8,7 @@
     <string name="auth0_audience">https://rfcx.eu.auth0.com/userinfo</string>
     <string name="auth0_scopes">openid email profile offline_access</string>
     <string name="auth0_metadata_key">https://rfcx.org/app_metadata</string>
+    <string name="auth0_user_metadata_key">https://rfcx.org/user_metadata</string>
 
     <string name="google_maps_key">AIzaSyC-NLZPDq0jl8G5ZOvX48OeTylK8XR0M0s</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 22db05551..9040f0daf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -38,6 +38,9 @@
 	<string name="please_tell_name">Please tell us your name</string>
 	<string name="hint_name">Name</string>
 	
+	<string name="terms_and_service">I have read and agree to these Terms and Service</string>
+	<string name="continue_text">Continue</string>
+	
 	<!-- common error -->
 	<string name="error_common">An error occurred. Please try again.</string>
 	<string name="location_permission_msg">Ranger App would like to use your location</string>
@@ -235,6 +238,7 @@
 	<string name="profile_feedback_label">Feedback</string>
 	<string name="profile_rate_app_label">Rate the app</string>
 	<string name="save_changed">Save Changes</string>
+	<string name="please_try_again_later">Please try again later</string>
 	
 	<string name="feedback_submitted">Feedback submitted. Thank you for your time :)</string>
 	<string name="feedback_submission_failed">Feedback submission failed! Please try again.</string>