Changed license to MPL 2.0 to match threadly 3.0.0 release
Updated gradle wrapper to 2.1
Merge remote-tracking branch 'upstream/master'

Conflicts:
	LICENSE