zmiany w api
Merge branch 'master' of https://github.com/jrura18/usosmobi_uam

Conflicts:
	res/layout/act_oceny.xml
	src/pl/uam/usosmobi/act/ActAktulanosci.java
	src/pl/uam/usosmobi/act/ActSplash.java
	src/pl/uam/usosmobi/api/ApiClient.java