lowered source and target level to 1.6, because of planned Android support
Merge remote-tracking branch 'origin/master'