Merge remote-tracking branch 'origin/pr/1'
Renaming of version properties and update of Android support version
Fixing travis
Merge branch 'pr/4'
Update AeroGear Crypto version
Added more memory in the build to make android plugin happy