Merge remote-tracking branch 'sandstranger/android'
updated credits file
Fix spell creation magicka cost (Fixes #1763)
replace remaining ANDROID with __ANDROID__