Merge branch 'master' into develop

Conflicts:
	OrangeBook/OrangeBook/src/main/java/com/amazingperformancestudio/orangebook/TextFragment.java