added feature 1
added feature 2
Merge branch 'feature1' into development
Merge branch 'feature2' into development
Merge branch 'development'
added feature 3
added newFiles "TEST" NSViewController
Merge branch 'feature3' into development
Merge branch 'newFiles' into development
Merge branch 'development'