making assets path relative
merging and compiling changes from master