new snapshot version
Merge branch 'master' into 3.2.0

Conflicts:
	android-hybrid/android-hybrid-eshop/pom.xml
	android-hybrid/android-hybrid-hw/pom.xml
	android-hybrid/pom.xml
	android-native/android-native-hw/pom.xml
	android-native/android-native-shoppingcart/pom.xml
	android-native/pom.xml
	drupal7/drupal7-eshop/pom.xml
	drupal7/drupal7-hw/pom.xml
	drupal7/pom.xml
	html5-jquery-mobile-widget/jquery-mobile-widget-eshop/pom.xml
	html5-jquery-mobile-widget/jquery-mobile-widget-hw/pom.xml
	html5-jquery-mobile-widget/pom.xml
	html5-jquery-widget/jquery-widget-eshop/pom.xml
	html5-jquery-widget/jquery-widget-hw/pom.xml
	html5-jquery-widget/pom.xml
	html5-mobile-widget/mobile-widget-eshop/pom.xml
	html5-mobile-widget/mobile-widget-hw/pom.xml
	html5-mobile-widget/pom.xml
	html5-widget/pom.xml
	html5-widget/widget-eshop/pom.xml
	html5-widget/widget-hw/pom.xml
	iphone-eshop-components/iphone-native-eshop-components/pom.xml
	iphone-eshop-components/pom.xml
	iphone-hybrid/iphone-hybrid-hw/pom.xml
	iphone-hybrid/iphone-hybrid-shoppingcart/pom.xml
	iphone-hybrid/pom.xml
	iphone-native/iphone-native-arc-shoppingcart/pom.xml
	iphone-native/iphone-native-hw/pom.xml
	iphone-native/iphone-native-shoppingcart/pom.xml
	iphone-native/pom.xml
	java-webservice/java-webservice-eshop/pom.xml
	java-webservice/java-webservice-hw/pom.xml
	java-webservice/pom.xml
	nodejs-webservice/nodejs-webservice-eshop/pom.xml
	nodejs-webservice/nodejs-webservice-hw/pom.xml
	nodejs-webservice/pom.xml
	php/php-blog/pom.xml
	php/php-hw/pom.xml
	php/pom.xml
	phresco-pom.xml
	pom-release.xml
	projects-pom.xml
	sharepoint/pom.xml
	sharepoint/sharepoint-hw/pom.xml
	sharepoint/sharepoint-resource-management/pom.xml
version changed
Merge branch '3.2.0'

Conflicts:
	android-hybrid/android-hybrid-eshop/pom.xml
	android-hybrid/android-hybrid-hw/pom.xml
	android-hybrid/pom.xml
	android-native/android-native-hw/pom.xml
	android-native/android-native-shoppingcart/pom.xml
	android-native/pom.xml
	drupal7/drupal7-eshop/pom.xml
	drupal7/drupal7-hw/pom.xml
	drupal7/pom.xml
	html5-jquery-widget/jquery-widget-eshop/pom.xml
	html5-jquery-widget/jquery-widget-hw/pom.xml
	html5-jquery-widget/pom.xml
	html5-mobile-widget/mobile-widget-eshop/pom.xml
	html5-mobile-widget/mobile-widget-hw/pom.xml
	html5-mobile-widget/pom.xml
	html5-widget/pom.xml
	html5-widget/widget-eshop/pom.xml
	html5-widget/widget-hw/pom.xml
	iphone-hybrid/iphone-hybrid-hw/pom.xml
	iphone-hybrid/iphone-hybrid-shoppingcart/pom.xml
	iphone-hybrid/pom.xml
	iphone-native/iphone-native-arc-shoppingcart/pom.xml
	iphone-native/iphone-native-hw/pom.xml
	iphone-native/iphone-native-shoppingcart/pom.xml
	iphone-native/pom.xml
	java-webservice/java-webservice-eshop/pom.xml
	java-webservice/java-webservice-hw/pom.xml
	java-webservice/pom.xml
	nodejs-webservice/nodejs-webservice-eshop/pom.xml
	nodejs-webservice/nodejs-webservice-hw/pom.xml
	nodejs-webservice/pom.xml
	php/php-blog/pom.xml
	php/php-hw/pom.xml
	php/pom.xml
	phresco-pom.xml
	pom-release.xml
	sharepoint/pom.xml
	sharepoint/sharepoint-hw/pom.xml
	sharepoint/sharepoint-resource-management/pom.xml