Fixed float 3 issue with f,fshift and shift_vec
On going changes on kernel AND reference for debugging purposes
Merge branch 'asc' into dk-dev

Conflicts:
	src/gromacs/gmxlib/gpu_utils/gpu_utils.cpp
	src/gromacs/legacyheaders/gpu_utils.h
	src/gromacs/legacyheaders/types/hw_info.h
	src/gromacs/mdlib/forcerec.c
	src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_data_mgmt.cpp
	src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernel_nvidia.clh
Fix automerge issues
Bad automerge on kernel
Merge branch 'dk' into dk-dev

Conflicts:
	src/gromacs/gmxlib/ocl_tools/vectype_ops.clh
	src/gromacs/legacyheaders/types/hw_info.h
	src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_gpu_ref.c
	src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_data_mgmt.cpp
	src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernel_nvidia.clh
	src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernel_utils.clh
Correct small merge differences (whitespaces)
Merge branch 'asc' of https://github.com/StreamComputing/gromacs into dk-dev
Other fixed. Manual merge from dk-dev-warps.

    Fix wrong const in kernel.
    Assert and compilation warning for ocl_is_ewald_analytical
 Other fixes. Manual merge from dk-dev-warps.

    Fix wrong const in kernel.
Merge pull request #45 from StreamComputing/dk

Dk