version 2.0.3beta5: fixed android packaging
merged master into development