into local rep
Merge branch 'master' of https://github.com/PROMAND/WhistlingPandas.git

Conflicts:
	src/pl/byd/promand/Team4/FetcherActivity.java