Merge branch 'master' of https://github.com/PyralabAndroid/EiT into HEAD
Merge branch 'master' of https://github.com/PyralabAndroid/EiT into HEAD

Conflicts:
	eit/src/main/java/pl/eit/androideit/eit/chanel/ChannelsActivity.java