Merging 0.7 changes from @juju95 and some bug fixes.
Assets directory changes.