gitignore
gitignore + conf eclipse
Merge branch 'master' of https://github.com/ma9loub/photomap

Conflicts:
	.classpath
	.gitignore
	.settings/.jsdtscope
	.settings/org.eclipse.core.resources.prefs
	.settings/org.eclipse.wst.common.component
POC addon easy upload