removed link to demo server
remove submodules
readded dependencies
removed symlinks
switch to mockup data
more symlinks removed
merge from master