tryin to get erything to work
Merge branch 'master' of https://github.com/forum2014/Alerte

Conflicts:
	.classpath
	.gitignore