switch to gradle 1.8 in wrapper
Merge remote-tracking branch 'origin/master'