Snapping dev branch code to master

This snapshot contains all the alpha code with snapped alpha build numbers.