Différenciation de cardView et card, utilisation de card dans
BoardActivity.
Chasse au code zombie.
Ajout d'EventManager et des classes d'Event
added general_layout
Merge remote-tracking branch 'origin/General_Layout' into toJava

Conflicts:
	uqcard/res/layout/activity_board.xml
	uqcard/res/values/strings.xml
	uqcard/src/com/refnil/uqcard/BoardActivity.java
	uqcard/src/com/refnil/uqcard/Card.java
	uqcard/src/com/refnil/uqcard/CardView.java
	uqcard/src/com/refnil/uqcard/CreatureCard.java
	uqcard/src/com/refnil/uqcard/CreatureCardView.java
	uqcard/src/com/refnil/uqcard/Event.java
	uqcard/src/com/refnil/uqcard/EventManager.java
	uqcard/src/com/refnil/uqcard/Event_Type.java
	uqcard/src/com/refnil/uqcard/GameConditionEvent.java
	uqcard/src/com/refnil/uqcard/ImageAdapter.java
	uqcard/src/com/refnil/uqcard/TurnPhaseEvent.java
Correct merged version of Card.java