Minor fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Android/Circa/mobile/src/main/res/values/styles.xml