Changed license to Apache, v2.0
Merge branch 'jar'