POM XML. Frode
gitIgnore
IML and XML files updated locally.
Merge branch 'master' of https://github.com/kosobudzkik/chat

Conflicts:
	pom.xml
Merge remote-tracking branch 'origin/master'
asmack library added and ArticleChatActivtity implemented
Merge branch 'master' into HEAD
forget pom.xml
Merge remote-tracking branch 'origin/master' into HEAD

Conflicts:
	AndroidManifest.xml