02.08.2013
Merge https://github.com/olegdunkan/ES_Layout

Conflicts:
	main.cpp