Merge back from develop

>Buying Xamarin software