wip
wip
wip
wip
Merge branch 'master' into styles

Conflicts:
	.idea/workspace.xml
	res/raw/changelog.txt