driod updates
Merge branch 'master' of https://github.com/rootdevelop/Sunny

Conflicts:
	App/Sunny.Droid/Resources/Resource.designer.cs