dev
Merge branch 'master' of https://github.com/gforot/NewForFaves.git

Conflicts:
	NewForFaves/NewForFaves.csproj
	NewForFaves/Resources/AppResources.Designer.cs
	NewForFaves/Resources/AppResources.resx
	NewForFaves/src/utils/Constants.cs
	NewForFaves/src/view/MainPage.xaml