merge with master, remove static files
added data dir
merge