Content tweet filter first implementation
Merge branch 'develop' of https://github.com/Ath0m/PJE into develop

Conflicts:
	src/model/AppModel.java