widok u gory
Merge branch 'master' of https://github.com/tpawlicki/mobilna

Conflicts:
	gen/com/projekt/mobileapk/R.java
	res/layout/activity_add_comment.xml
	src/com/projekt/mobileapk/EventsActivity.java
cgvsdfdfb
Merge branch 'master' of https://github.com/tpawlicki/mobilna

Conflicts:
	res/values/strings.xml
gn