Test with ampersand character in attributeset name
Adding System Config for Attribute CSV Path (Catalog/Catalog/Attribute Configurator)
Renaming Observer Model Filename
merged master back into development
Merge branch 'develop' of github.com:magento-hackathon/AttributeConfigurator into develop
createFileHash Method
Merge branch 'develop' of github.com:magento-hackathon/AttributeConfigurator into develop
CodeFormatting
[FIX] csv -> xml in config.xml
Add standard attribute configuration options
Merge branch 'develop' of git://github.com/magento-hackathon/AttributeConfigurator into develop
added Test for Observer, fixed declaration in config.xml
Event moved into adminhtml node
Versioncheck Preparation
Merge branch 'develop' of github.com:magento-hackathon/AttributeConfigurator into develop

Conflicts:
	src/app/code/community/Hackathon/AttributeConfigurator/etc/config.xml
Changing Observer Event to general predispatch. Adding Attribute Model.
Merging conflicts
Reverting Event Name
File Hashing done
Merge branch 'develop' of github.com:magento-hackathon/AttributeConfigurator into develop