update
Merge branch 'master' of https://github.com/fatalpanda/cliclictheme

Conflicts:
	_check.php