settings
Merge remote-tracking branch 'origin/pospa' into pospa

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml
ration images