my configuration
Merge branch 'trunk' of https://github.com/SergeySukhanov/zeroProject into trunk

Conflicts:
	js/initConfiguration.js