Merge branch 'develop' of github.com:snipe/snipe-it into develop

Conflicts:
	.travis.yml

.travis.yml

@@ -1,24 +1,36 @@
+# see http://about.travis-ci.org/docs/user/languages/php/ for more hints
 language: php
+
+# list any PHP version you want to test against
 php:
-- 5.4
-- 5.5
-- 5.6
+  - 5.4
+  - 5.5
+  - 5.6
+
+# optionally specify a list of environments, for example to test different RDBMS
 env:
-- DB=mysql
+  - DB=mysql
+
+# execute any number of scripts before the test run, custom env's are available as variables
 before_script:
-- if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS snipeit_laravel;"
-  -utravis; fi
-- curl -s http://getcomposer.org/installer | php
-- cp app/config/production/database.example.php app/config/database.php
-- cp app/config/production/mail.example.php app/config/mail.php
-- php composer.phar self-update
-- php composer.phar install --prefer-source --no-interaction --dev
-- php artisan key:generate
-- php artisan migrate:install
-- php artisan migrate --package cartalyst/sentry
-- php artisan migrate
-- php artisan db:seed
+  - if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS snipeit_laravel;" -utravis; fi
+  - curl -s http://getcomposer.org/installer | php
+  - cp app/config/production/database.example.php app/config/database.php
+  - cp app/config/production/mail.example.php app/config/mail.php
+  - php composer.phar self-update
+  - php composer.phar validate
+  - php composer.phar install --prefer-source --no-interaction --dev
+  - php artisan key:generate
+  - php artisan migrate:install
+  - php artisan migrate --package cartalyst/sentry
+  - php artisan migrate
+  - php artisan db:seed
+
+# omitting "script:" will default to phpunit
+# use the $DB env variable to determine the phpunit.xml to use
 script: phpunit
+
+# configure notifications (email, IRC, campfire etc)
 notifications:
   slack:
     secure: vv9we1RxB9RsrMbomSdq6D7vz/okobw87pEkgIZjB+hj1QpQ2by90gsPsOa+NgsJEFaEP7e4KlT6SH8kK+zhbmuKaUd3d1//XdcancE22LZXi6tkiB5yuR/Jhhb1LLDqyGJTB4D92hMnnCPiUjpxNA3r437ttNeYRdYIEEP3drA=

composer.json

@@ -1,7 +1,13 @@
 {
-	"name": "laravel/laravel",
-	"description": "The Laravel Framework.",
-	"keywords": ["framework", "laravel"],
+	"name": "snipe/snipe-it",
+	"description": "A free open source IT asset/license management system built in PHP on Laravel 4.1 and Bootstrap 3.",
+	"keywords": ["framework", "laravel", "assets", "IT", "management"],
+	"homepage": "http://snipeitapp.com/",
+	"license": "AGPL-3.0",
+	"support": {
+		"issues": "https://github.com/snipe/snipe-it/issues",
+		"source": "https://github.com/snipe/snipe-it"
+	},
 	"require": {
 		"laravel/framework": "4.1.*",
 		"cartalyst/sentry": "2.0.*",