Reset gameView branch for the new architecture
Merge branch 'develop' into gameView

Conflicts:
	.gitignore
	DoctorJ.iml
	README.md
	README_FR.md
	src/fr/intechinfo/doctorj/tests/StepTest.java
Release out: version 1.0!
Merge branch 'develop' into release
Release out: version 1.1!
Merge branch 'develop' into release
Release out: version 1.2!
Added media player to game view.
Merge branch 'develop' of github.com:JulienBernard/DoctorJ into develop

Conflicts:
	src/fr/intechinfo/doctorj/controllers/Game.java
Merge branch 'develop' into release
Release out: version 1.3!
Fixed bug: added controller (super) to Game.
Merge branch 'develop' into gameView
Added new constructor to link the StoryLine object between views.
Removed JSON import and initialization.
Added a story for the test!