Changing title to antox
Add .nomedia file creation in /Antox/
Merge branch 'Proplex-master'

Conflicts:
	app/src/main/res/values/strings.xml
Merge branch 'upstreammy-3' of https://github.com/Proplex/Antox into Proplex-upstreammy-3