deleted /assets directory (on svn)
Merge branch 'dev'