Merge branch 'master' of https://github.com/viennacl/viennacl-benchmark-gui

Conflicts:
	benchmarks/benchmark_solver.cpp