Faeriol/SEG2505ProjetAndroid2013 — pull request #3 by Faeriol (2013-11-28 15:11:49+00:00)
Title: Merge changes from laganiere

Laganiere made even more progress, we need to import the changes