changes for giteye application
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
docear workspace bugfix: do not add a project twice