step3,4
Merge branch 'master' of https://github.com/fomin-stas/rgu

Conflicts:
	application/views/structure/step4.php
Merge branch 'master' of https://github.com/fomin-stas/rgu

Conflicts:
	application/views/structure/step4.php
Merge branch 'master' of https://github.com/fomin-stas/rgu