Merge branch 'master' of https://github.com/BlackListTeam/blacklist-android

Conflicts:
	BlackList/src/main/AndroidManifest.xml
	BlackList/src/main/res/values/strings.xml
Merge branch 'master' of https://github.com/BlackListTeam/blacklist-android
Merge branch 'master' of https://github.com/BlackListTeam/blacklist-android

Conflicts:
	BlackList/src/main/AndroidManifest.xml
	BlackList/src/main/res/values/strings.xml
Merge branch 'master' of https://github.com/BlackListTeam/blacklist-android
Merge branch 'master' of https://github.com/BlackListTeam/blacklist-android

Conflicts:
	BlackList/src/main/AndroidManifest.xml
	BlackList/src/main/res/values/strings.xml
Merge branch 'master' of https://github.com/BlackListTeam/blacklist-android
Merge branch 'master' of https://github.com/BlackListTeam/blacklist-android

Conflicts:
	BlackList/src/main/AndroidManifest.xml
	BlackList/src/main/res/values/strings.xml