add glasspath .project and .settings to gitignore
add glasspath .project and .settings to gitignore
Merge branch '1.0' of github.com:openflexo-team/diana into 1.0
clean up eclipse configuration file