merging android-client to master, updating constants class and some link
implementations