Updated gradle
Fixed rare null pointer exception. Updated gradle version
Version code update
Merged with develop-pre-api15