add db modelisation
fix syntax
bug fixing
Fix conflicts from teemo repo
fdsfdsfdsfdsfd
Revert "fix syntax"

This reverts commit e31a45f8eaab0a2cb129bcad20e2510a5621c64b.
Add mockups and db modelisation
Add mockups and db modelisation
add twitter bootstrap
update project
update project
update all
Merge commit 'fca59d22cd610c6ef612df271c3db258006b8184'
fix merge from dev2 branch