Removed main.cpp
Renamed main.mm to main.cpp
Merge branch 'master' into glib-support