Punch to alpha8 ; bugfixes

• Merge branch 'development'
• repairs broken timesave functionality
• copy over content instead of moving stuff around