Merge pull request #15 from carlosgs/development

Deleted CSG file that wasn't necessary
Merge branch 'development' into test
Merge branch 'development' into test
Merge branch 'development' into test
Merge branch 'development' into test
Merge branch 'development' into test
Merge branch 'development' into test
Merge branch 'development' into test
Merge branch 'development' into test
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'master' into development