Merge branch 'Synchro_gitignore' into develop
remove useless things
Remove useless things, again....
Merge branch 'post_a_comment' into develop
Merge remote-tracking branch 'origin/develop' into search

Conflicts:
	src/org/imagine/supportingfiles/ImagineMainClass.java