Merge branch 'master' of D:\Pulpit\JAVA applications\komunikator with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
AndroidManifest.xml deleted from volley.jar