Merge remote-tracking branch 'origin/master'

Conflicts:
	app2/featureJob/.idea/compiler.xml
	app2/featureJob/.idea/encodings.xml
	app2/featureJob/.idea/misc.xml
	app2/featureJob/.idea/modules.xml
	app2/featureJob/.idea/workspace.xml
	app2/featureJob/featureJob.iml