Merge branch 'gabriel' into jem
fixed .gitignore
create a global modal search for fixed assegt
removed some model
Merge remote-tracking branch 'origin/jem' into jem
hhh
bootstrap.css conflict