Merge branch 'personal/kob2' into personal/merge_mx12
composer update
test
Merge branch 'personal/kob2' into personal/mac
Merge branch 'personal/kob2' into personal/mac
Merge branch 'personal/kob2' into personal/mac
test
test
Merge branch 'personal/kob2' into personal/mac
billing detail
billing detail
ttt
fixfinish bill
Merge branch 'personal/kob2' into personal/merge_mx12

Conflicts:
	app/config/database.php
	composer.json
	composer.lock
	vendor/autoload.php
	vendor/composer/autoload_classmap.php
	vendor/composer/autoload_real.php
	vendor/composer/installed.json
	vendor/intervention/image/.gitignore
	vendor/intervention/image/.travis.yml
	vendor/intervention/image/README.md
	vendor/intervention/image/composer.json
	vendor/intervention/image/src/Intervention/Image/AbstractColor.php
	vendor/intervention/image/src/Intervention/Image/AbstractDriver.php
	vendor/intervention/image/src/Intervention/Image/AbstractEncoder.php
	vendor/intervention/image/src/Intervention/Image/AbstractFont.php
	vendor/intervention/image/src/Intervention/Image/Commands/AbstractCommand.php
	vendor/intervention/image/src/Intervention/Image/Commands/Argument.php
	vendor/intervention/image/src/Intervention/Image/Commands/ChecksumCommand.php
	vendor/intervention/image/src/Intervention/Image/Commands/CircleCommand.php
	vendor/intervention/image/src/Intervention/Image/Commands/EllipseCommand.php
	vendor/intervention/image/src/Intervention/Image/Commands/ExifCommand.php
	vendor/intervention/image/src/Intervention/Image/Commands/LineCommand.php
	vendor/intervention/image/src/Intervention/Image/Commands/RectangleCommand.php
	vendor/intervention/image/src/Intervention/Image/Commands/ResponseCommand.php
	vendor/intervention/image/src/Intervention/Image/Commands/TextCommand.php
	vendor/intervention/image/src/Intervention/Image/Constraint.php
	vendor/intervention/image/src/Intervention/Image/File.php
	vendor/intervention/image/src/Intervention/Image/Filters/DemoFilter.php
	vendor/intervention/image/src/Intervention/Image/Filters/FilterInterface.php
	vendor/intervention/image/src/Intervention/Image/Gd/Color.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/BackupCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/BlurCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/BrightnessCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/ColorizeCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/ContrastCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/CropCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/DestroyCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/FillCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/FitCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/FlipCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/GammaCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/GetSizeCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/GreyscaleCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/HeightenCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/InsertCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/InterlaceCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/InvertCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/LimitColorsCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/MaskCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/OpacityCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/PickColorCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/PixelCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/PixelateCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/ResetCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/ResizeCanvasCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/ResizeCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/RotateCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/TrimCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Commands/WidenCommand.php
	vendor/intervention/image/src/Intervention/Image/Gd/Driver.php
	vendor/intervention/image/src/Intervention/Image/Gd/Encoder.php
	vendor/intervention/image/src/Intervention/Image/Gd/Font.php
	vendor/intervention/image/src/Intervention/Image/Image.php
	vendor/intervention/image/src/Intervention/Image/ImageManager.php
	vendor/intervention/image/src/Intervention/Image/ImageManagerStatic.php
	vendor/intervention/image/src/Intervention/Image/ImageServiceProvider.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Color.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/BackupCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/BlurCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/BrightnessCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/ColorizeCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/ContrastCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/CropCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/DestroyCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/FillCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/FitCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/FlipCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/GammaCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/GetSizeCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/GreyscaleCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/HeightenCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/InsertCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/InterlaceCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/InvertCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/LimitColorsCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/MaskCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/OpacityCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/PickColorCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/PixelCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/PixelateCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/ResetCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/ResizeCanvasCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/ResizeCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/RotateCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/TrimCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Commands/WidenCommand.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Driver.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Encoder.php
	vendor/intervention/image/src/Intervention/Image/Imagick/Font.php
	vendor/intervention/image/src/Intervention/Image/Response.php
	vendor/intervention/image/src/Intervention/Image/Size.php
	vendor/intervention/image/tests/AbstractFontTest.php
	vendor/intervention/image/tests/ArgumentTest.php
	vendor/intervention/image/tests/BackupCommandTest.php
	vendor/intervention/image/tests/DriverTest.php
	vendor/intervention/image/tests/EncoderTest.php
	vendor/intervention/image/tests/ExifCommandTest.php
	vendor/intervention/image/tests/FitCommandTest.php
	vendor/intervention/image/tests/GdColorTest.php
	vendor/intervention/image/tests/GdSystemTest.php
	vendor/intervention/image/tests/GetsizeCommandTest.php
	vendor/intervention/image/tests/ImageManagerStaticTest.php
	vendor/intervention/image/tests/ImageTest.php
	vendor/intervention/image/tests/ImagickColorTest.php
	vendor/intervention/image/tests/ImagickSystemTest.php
	vendor/intervention/image/tests/OpacityCommandTest.php
	vendor/intervention/image/tests/ResetCommandTest.php
	vendor/intervention/image/tests/SizeTest.php
	vendor/intervention/image/tests/TrimCommandTest.php
Merge branch 'personal/mac' into personal/merge_mx12

Conflicts:
	app/config/database.php
no pay before confirm
Merge branch 'personal/kob2' into personal/merge_mx12
fix
Merge branch 'personal/kob2' into personal/merge_mx12
fix