Merge pull request #243 from nickescallon/dev

fixed bug where angular and jquery were loaded twice