changed bin folder
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/dataSources.xml
	.idea/shop.iml
	.idea/workspace.xml
changed mysql2 database.yml