Trying to merge
Merge branch 'pr/3'

Conflicts:
	gen/com/eecs/seg2505_2013/R.java
	gen/com/swarmconnect/R.java
	project.properties
	src/com/eecs/seg2505_2013/Question.java
	src/com/eecs/seg2505_2013/Reponse.java
	src/com/eecs/seg2505_2013/Utilisateur.java