Development branch created

I've synced some change sets with the master code (to find problems more easily)