Merge pull request #6 from BeanPlant/the_DJDJ

Pull Request: the_DJDJ [3] - New BeanPlant Chat Version
changed embarrassed emoticon

replaced old embarrassed emoticon with one I made (really challenging)
emoticons copied to src folder

put emoticons in the src folder
Merge pull request #7 from BeanPlant/the_DJDJ

Pull Request: the_DJDJ [4] - Urgent Fix
Merge pull request #8 from BeanPlant/the_DJDJ

Pull Request: the_DJDJ [5]
Merge branch 'Mrbloodwolfie'
Merge branch 'master' of https://github.com/BeanPlant/BeanPlant-Chat

Conflicts:

	build/classes/BeanPlant/the_DJDJ/APP_Chat/ui/swing/settings/MiscPanel.class
	nbproject/private/private.xml
Merge pull request #10 from BeanPlant/the_DJDJ

Pull Request: the_DJDJ [6] - Complete Sync
Merge pull request #11 from BeanPlant/master

[master] Sync