Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]>

# Conflicts:
#	config/version.php

Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]>

# Conflicts:
#	config/version.php
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json

Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]>

# Conflicts:
#	config/version.php

Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]>

# Conflicts:
#	config/version.php

Bumped version

Signed-off-by: snipe <[email protected]>

# Conflicts:
#	config/version.php

Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]>

# Conflicts:
#	config/version.php

Merge remote-tracking branch 'origin/develop'

Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]>

# Conflicts:
#	config/version.php

Merge remote-tracking branch 'origin/develop'

Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]>

# Conflicts:
#	config/version.php