Merge branch 'master' of https://github.com/papayafiction/triangula into moe

Conflicts:
	res/values/strings.xml