Merge branch 'coordinates-getter' into dev-2.1

Conflicts resolved in :
	build/Linux/Makefile
	build/Linux/Makefile_Rev
	build/Xcode/epanet.xcodeproj/project.pbxproj
	include/epanet2.h

.gitignore

@@ -2,9 +2,14 @@
 *.slo
 *.lo
 *.o
+*.map
+*.exp
+*.lib
 
-# Compiled Dynamic libraries
+# Compiled Dynamic libraries and executables
 *.so
+*.dll
+*.exe
 
 # Compiled Static libraries
 *.lai
@@ -101,6 +106,7 @@ ipch/
 *.psess
 *.vsp
 *.vspx
+*.idb
 
 # Guidance Automation Toolkit
 *.gpState