Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	devel/libecl_well/applications/CMakeLists.txt
Merged upstream/master
Changed ecl_grid_iget_lgr_name() to use lgr_index (i.e. running nr) and not lgr_nr
Merge pull request #132 from joakim-hove/well_lgr_load_fail

Well lgr load fail