mise a jour 2014
Merge branch 'master' of https://github.com/sepiropht/caltopo

Conflicts:
	caltopo.pro.user
	fenprincipale.cpp
	fenprincipale.h
	graphwidget.cpp
	graphwidget.h
	node.cpp
	node.h