merges with 2.0 working branch
downgrades to bootstrap 3.0.3
updates packages