Composer updated with jquery
Merge pull request #4 from tswizzy/ENG-17

Composer updated with jquery
ENG-16 upgrade bootstrap
Merge pull request #5 from tswizzy/ENG-16

ENG-16 upgrade bootstrap
ENG-17 remove jquery from composer
ENG-16 upgrade jquery
Merge pull request #6 from tswizzy/ENG-17

Eng 17
ENG-15 conflicts