Possibly fix NPE while getting language data
Bump version
Merge and cleanup gradle files