updated StringTemplate files for Android devices
fixed minor bugs