synchronization with library-service branch
Merge branch 'master' into android-1.5
RunActivityAction has gone
Merge branch 'master' into android-1.5
cleanup
Merge branch 'master' into android-1.5