Merge branch '2.2' into 3.0

Signed-off-by: crynobone <crynobone@gmail.com>

.gitattributes

@@ -11,5 +11,5 @@
 /.travis.yml        export-ignore
 /build.xml          export-ignore
 /phpunit.xml        export-ignore
-/LICENSE.md         export-ignore
+/LICENSE            export-ignore
 /README.md          export-ignore

README.md

@@ -4,11 +4,26 @@ Publisher Component for Orchestra Platform
 [![Latest Stable Version](https://img.shields.io/github/release/orchestral/publisher.svg?style=flat)](https://packagist.org/packages/orchestra/publisher)
 [![Total Downloads](https://img.shields.io/packagist/dt/orchestra/publisher.svg?style=flat)](https://packagist.org/packages/orchestra/publisher)
 [![MIT License](https://img.shields.io/packagist/l/orchestra/publisher.svg?style=flat)](https://packagist.org/packages/orchestra/publisher)
-[![Build Status](https://img.shields.io/travis/orchestral/publisher/master.svg?style=flat)](https://travis-ci.org/orchestral/publisher)
-[![Coverage Status](https://img.shields.io/coveralls/orchestral/publisher/master.svg?style=flat)](https://coveralls.io/r/orchestral/publisher?branch=master)
-[![Scrutinizer Quality Score](https://img.shields.io/scrutinizer/g/orchestral/publisher/master.svg?style=flat)](https://scrutinizer-ci.com/g/orchestral/publisher/)
+[![Build Status](https://img.shields.io/travis/orchestral/publisher/3.0.svg?style=flat)](https://travis-ci.org/orchestral/publisher)
+[![Coverage Status](https://img.shields.io/coveralls/orchestral/publisher/3.0.svg?style=flat)](https://coveralls.io/r/orchestral/publisher?branch=3.0)
+[![Scrutinizer Quality Score](https://img.shields.io/scrutinizer/g/orchestral/publisher/3.0.svg?style=flat)](https://scrutinizer-ci.com/g/orchestral/publisher/)
 
-## Quick Installation
+## Table of Content
+
+* [Version Compatibility](#version-compatibility)
+* [Installation](#installation)
+* [Configuration](#configuration)
+* [Resources](#resources)
+
+## Version Compatibility
+
+Laravel    | Publisher
+:----------|:----------
+ 4.1.x     | 2.1.x
+ 4.2.x     | 2.2.x
+ 5.0.x     | 3.0.x
+
+## Installation
 
 To install through composer, simply put the following in your `composer.json` file:
 
@@ -20,7 +35,17 @@ To install through composer, simply put the following in your `composer.json` fi
 }
 ```
 
-Next add the following service provider in `app/config/app.php`.
+And then run `composer install` from the terminal.
+
+### Quick Installation
+
+Above installation can also be simplify by using the following command:
+
+    composer require "orchestra/publisher=3.0.*"
+
+## Configuration
+
+Add following service providers in `config/app.php`.
 
 ```php
 'providers' => [

composer.json

@@ -33,7 +33,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "3.0-dev"
+			"dev-master": "3.1-dev"
 		}
 	},
 	"minimum-stability": "dev"