categories api
Merge branch 'master' of https://github.com/cipele46/cipele46-android

Conflicts:
	src/eu/fiveminutes/cipele46/api/CipeleAPI.java
Merge branch 'master' of https://github.com/cipele46/cipele46-android
Merge branch 'master' of https://github.com/cipele46/cipele46-android