fixing make clean error
resolving merge
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
changes to allow build to function on MacOS 10.9 Mavericks