Signed-off-by: seif <seif@seif>
Merge branch 'master' of
ssh://git@github.com/seifesprit/jetsetmagazine.git

Conflicts:
	tn.edu.esprit.info.jetsetmagasine/src/tn/edu/esprit/info/jetsetmagasine/domain/A.java