Put extra serializable
Merge branch 'master' of https://github.com/Adrien10/MonTpPorte

Conflicts:
	src/com/imie/montpporte/MainActivity.java
	src/com/imie/montpporte/StationActivity.java