Merge pull request #28 from merepro/dev

Moved JS and CSS into bundles, and updated requirements