update setup & makefile, revision number
Merge branch 'developing' into exit_android