333
tft 666
new1 777
Merge branch 'new1' into d

Conflicts:
	frontend/views/test/index.php