Merge remote-tracking branch 'origin/master'

Conflicts:
	app/storage/logs/laravel.log
Nomenclature
Revert "Nomenclature"

This reverts commit 6b3e352f36c88faa5e884bd01cf2a4985f83d8e2.