Merge branch 'new_rest' of github.com:ogrebgr/khandroid into new_rest

Conflicts:

khandroid_lib/src/com/github/khandroid/new_rest/RestExchange.java