1
Merge branch 'master' of github.com:betaagency/common

Conflicts:
	lib/images.php