Fixed rare null pointer exception. Updated gradle version
Version code update
Merge branch 'develop-pre-api15'