updating everything to current version
modulizing css
fixing json to point at the right place
merging dev