Fixed problem with private fields.
Merge branch 'develop' into feature/AndroidBeam