iml
eventos mensajes
iml
iml
iml
Merge branch 'master' of https://github.com/Ozius/EuskalDC

Conflicts:
	EuskalDC.iml
	app/src/main/java/com/mugitek/euskaldc/BusProvider.java
Merge branch 'master' of https://github.com/Ozius/EuskalDC

Conflicts:
	app/src/main/java/com/mugitek/euskaldc/eventos/SendMessageEvent.java