replacing instance variables
Bug CVS is fixed
Bug fix CVS is fixed
whitespace/styling fixes
remove unused variable
set export title to query or default
refactor to reduce complexity
Merge pull request #1 from opf/hotfix/fix_wp_csv_export

Hotfix/fix wp csv export
Merge pull request #2366 from TribesTom/hotfix/fix_csv_export

Hotfix/fix csv export
increase protractor timeouts
add waitForAngular call after page.get()
Merge branch 'release/4.0' into dev

Conflicts:
	app/controllers/work_packages_controller.rb
	app/models/work_package/csv_exporter.rb
	spec/controllers/work_packages_controller_spec.rb
Merge pull request #2350 from opf/feature/access_control_refactor

replacing instance variables
Merge pull request #2370 from 0xF013/bug/17805-fix-flickering-protractor-tests

17805 fix flickering protractor tests
add sort criteria to columns joined to query
Merge pull request #2371 from opf/hotfix/wp_sorting_by_not_selected_column

add sort criteria to columns joined to query
Merge branch 'release/4.0' into dev

Signed-off-by: Alex Coles <alex@alexbcoles.com>

Conflicts:
	spec/features/work_packages/select_work_package_row_spec.rb
STUFF

Signed-off-by: Alex Coles <alex@alexbcoles.com>
Merge branch 'dev' into feature/foundation-apps-framework