assets precompiled
removed schema from git cached
more assets
updated git ignore
fixed merge conflicts