Merge remote-tracking branch 'origin/master'

Conflicts:

	OfficeControlApp/OfficeControlMobile/OfficeControl.Demo/OfficeControl.Demo.iceproj
	OfficeControlApp/OfficeControlMobile/OfficeControlMobile.v12.suo

DDD

KKK
Merge branch 'master' of https://github.com/stoianpp/HybridMobilesProject