Added database sources to the project
Deleting cache
Adding custom module to commit
Uploading db sources again
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/app/code/local/Havchik/Cart/etc/config.xml
Uploading db sources again