added emoticons again
added toggle button for emoticons
Merge branch 'master' of https://github.com/rbi/twattler

Conflicts:
	src/main/java/de/saxsys/twattler/TwattlerController.java