herpa derpa
Merge branch 'master' of http://github.com/sampoz/happyapp

Conflicts:
	MiniBrowser/MiniBrowser/MainPage.xaml
	MiniBrowser/MiniBrowser/MainPage.xaml.cs
	MiniBrowser/MiniBrowser/StatsPage.xaml.cs