local
Merge branch 'master' of github.com:Sehenge/mage

Conflicts:
	app/etc/local.xml
Merge branch 'master' of github.com:Sehenge/mage
adxml
omg
Merge branch 'master' of github.com:Sehenge/mage

Conflicts:
	adxmlparse.php
fuck