merge fix - rollback
Merge
merge
Route merge
Environment minifying
update environment
Update search
TwrexStructurer - Omit duplicates that may occur in original CSV file
TwrexStructurer - Comment debug lines
TwrexStructurer - unique twrexLines
TwrexStructurer - Multidimensional array_unique tweak
TwrexStructurer - Rewrite Batch insert
TwrexStructurer - twewak batch and hash
Clever memory optimization by serializing > 50k + array :)
Merge branch 'master' of https://github.com/khamkham/crowd-watson into arne

Step 1

Conflicts:
	app/assets/javascripts/handlebars.swag.js
	app/assets/stylesheets/style.css.scss
	app/controllers/preprocess/TwrexController.php
	app/models/preprocess/AMTCSVresultMapper.php
	app/models/preprocess/TwrexStructurer.php
	app/routes.php
	app/views/files/search/layouts/hb-twrex-structured-sentence.blade.php
	composer.lock
removed conflictfiles