Merge remote-tracking branch 'origin/master'

Conflicts:
	out/WEB-INF/ckfinder.xml
	out/WEB-INF/classes/config/core/config.properties
	out/WEB-INF/web.xml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	out/WEB-INF/ckfinder.xml
	out/WEB-INF/classes/config/core/config.properties
	out/WEB-INF/web.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	mobile-cms-web/src/main/resources/config/core/config.properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	mobile-cms-web/src/main/resources/config/core/config.properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	mobile-cms-web/src/main/resources/config/core/config.properties