Faeriol/SEG2505ProjetAndroid2013 — pull request #4 by Faeriol (2013-11-29 21:23:59+00:00)
Title: Remerge with Master from Laganiere

Laganiere imported more stuff lets import it