Merge remote-tracking branch 'origin/master' into test

Conflicts:
	src/main/java/com/tiesb/tuta/EditWordsFragment.java
	src/main/java/com/tiesb/tuta/TestFragment.java
	src/main/java/com/tiesb/tuta/TestHolder.java