11-05-2014 plan zajec
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/pl/uam/usosmobi/api/ApiClient.java