mapping master branch to 3.0.* milestone
fixed the licence name (see http://spdx.org/licenses/Apache-2.0)