nomenclature
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/storage/logs/laravel.log
	app/storage/views/0f9cc439a4910e092829945c640d33ac
	app/views/header.blade.php
	public/css/plastock.css