- merged some local changes (avoid using deprecated APIs)
- the xcode project has been civilized
(stuff was messed up a bit by the flowmixer branch and new files were in
weird locations)
NOTE:
this is still a work in progress and all functionalities still need
testing. Something could have been messed up by mergin my local changes
with flowmixer branch