update core to 1.2.3
Merge branch 'master' of https://github.com/pixelgrade/pixlikes

Conflicts:
	js/public.js
	plugin-defaults.php
	settings/cache.php
	settings/general.php
	settings/show_on.php
	views/admin.php