Will climate change lead to water wars?

Water scarcity already affects about 40% of the world's population and droughts could put up to 700 million people at risk of displacement by the year 2030. Are we entering a new era of violent conflict over water?