Proba zrobienia popup
Merge branch 'master' of https://github.com/ehrid/studia.NAPWr

Conflicts:
	gen/pl/wroc/pwr/na/R.java
Merge branch 'master' of https://github.com/ehrid/studia.NAPWr