Some modifs
Merge branch 'master' of github.com:aoqfonseca/socialbus

Conflicts:
	src/main/java/org/socialbus/messages/TwitterMessage.java