blerg
Merge branch 'test' of https://github.com/stutay/PIM into test

Conflicts:
	flush.php