cleanup framework.php from moving tests to new dir
Merge branch 'master-backup'
merge to master
added untracked files