pre checkout
cropping
Merge branch 'master' into dev_server2

Conflicts:
	.gitignore