Fixed up files with no newline breaks
Merge branch 'newframework' into activityRefactor