Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	app/Http/Controllers/TeamFileController.php
#	app/TeamFile.php
#	config/adminlte.php
#	routes/web.php

app/Team.php

@@ -37,7 +37,6 @@ class Team extends TeamworkTeam
         return $this->belongsToMany('App\Vacancy', 'team_has_vacancy');
     }
 
-
     public function files()
     {
         return $this->hasMany('App\TeamFile', 'team_id');