Merge remote-tracking branch 'origin/develop'

Author: snipe

app/config/version.php

@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v2.0-171',
-  'hash_version' => 'v2.0-171-ga7ea98a',
+  'app_version' => 'v2.0-175',
+  'hash_version' => 'v2.0-175-gd0aab3e',
 );

app/controllers/admin/AssetsController.php

@@ -708,7 +708,7 @@ public function getProcessImportFile($filename) {
         // php artisan asset-import:csv path/to/your/file.csv --domain=yourdomain.com --email_format=firstname.lastname
 
         $output = new BufferedOutput;
-        Artisan::call('asset-import:csv', ['filename'=> app_path().'/private_uploads/imports/assets/'.$filename, '--domain'=>'snipe.net', '--email_format'=>'firstname.lastname'], $output);
+        Artisan::call('asset-import:csv', ['filename'=> app_path().'/private_uploads/imports/assets/'.$filename, '--email_format'=>'firstname.lastname', '--username_format'=>'firstname.lastname'], $output);
         $display_output =  $output->fetch();
         $file = app_path().'/private_uploads/imports/assets/'.str_replace('.csv','',$filename).'-output-'.date("Y-m-d-his").'.txt';
         file_put_contents($file, $display_output);

install.sh

@@ -104,7 +104,7 @@ if [[ $distro == "u" ]]; then
 
 	#We already established MySQL root & user PWs, so we dont need to be prompted. Let's go ahead and install Apache, PHP and MySQL.
 	sudo DEBIAN_FRONTEND=noninteractive apt-get install -y lamp-server^
-	sudo apt-get install -y php5 php5-mcrypt php5-curl php5-mysql
+	sudo apt-get install -y php5 php5-mcrypt php5-curl php5-mysql php-gd
 
 	#Create MySQL accounts
 	echo "Create MySQL accounts"