beginning
Merge remote-tracking branch 'origin/Flickr_API_Connexion' into Flickr_API_Connexion

Conflicts:
	.classpath
	src/org/imagine/services/MainServiceModule.java