Merge branch '2.2' into 3.0

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

Conflicts:
	README.md

.gitattributes

@@ -9,8 +9,7 @@
 /.gitignore         export-ignore
 /.scrutinizer.yml   export-ignore
 /.travis.yml        export-ignore
-/Guardfile          export-ignore
 /build.xml          export-ignore
 /phpunit.xml        export-ignore
-/LICENSE.md         export-ignore
+/LICENSE            export-ignore
 /README.md          export-ignore

README.md

@@ -10,11 +10,27 @@ Orchestra Platform Widget Component
 [![Latest Stable Version](https://img.shields.io/github/release/orchestral/widget.svg?style=flat)](https://packagist.org/packages/orchestra/widget)
 [![Total Downloads](https://img.shields.io/packagist/dt/orchestra/widget.svg?style=flat)](https://packagist.org/packages/orchestra/widget)
 [![MIT License](https://img.shields.io/packagist/l/orchestra/widget.svg?style=flat)](https://packagist.org/packages/orchestra/widget)
-[![Build Status](https://img.shields.io/travis/orchestral/widget/master.svg?style=flat)](https://travis-ci.org/orchestral/widget)
-[![Coverage Status](https://img.shields.io/coveralls/orchestral/widget/master.svg?style=flat)](https://coveralls.io/r/orchestral/widget?branch=master)
-[![Scrutinizer Quality Score](https://img.shields.io/scrutinizer/g/orchestral/widget/master.svg?style=flat)](https://scrutinizer-ci.com/g/orchestral/widget/)
+[![Build Status](https://img.shields.io/travis/orchestral/widget/3.0.svg?style=flat)](https://travis-ci.org/orchestral/widget)
+[![Coverage Status](https://img.shields.io/coveralls/orchestral/widget/3.0.svg?style=flat)](https://coveralls.io/r/orchestral/widget?branch=3.0)
+[![Scrutinizer Quality Score](https://img.shields.io/scrutinizer/g/orchestral/widget/3.0.svg?style=flat)](https://scrutinizer-ci.com/g/orchestral/widget/)
 
-## Quick Installation
+## Table of Content
+
+* [Version Compatibility](#version-compatibility)
+* [Installation](#installation)
+* [Configuration](#configuration)
+* [Resources](#resources)
+
+## Version Compatibility
+
+Laravel    | Widget
+:----------|:----------
+ 4.0.x     | 2.0.x
+ 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:
 
@@ -26,15 +42,25 @@ To install through composer, simply put the following in your `composer.json` fi
 }
 ```
 
-Next add the 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/widget=3.0.*"
+
+## Configuration
+
+Add following service providers in `config/app.php`.
 
 ```php
-'providers' => array(
+'providers' => [
 
 	// ...
 
 	'Orchestra\Widget\WidgetServiceProvider',
-),
+],
 ```
 
 ## Resources

composer.json

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