1
Merge remote-tracking branch 'origin/test' into dev

Conflicts:
	gt.txt
Update index.php
Merge remote-tracking branch 'origin/test' into dev

Conflicts:
	gt.txt
Merge pull request #1 from vetal2409/master

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

Conflicts:
	frontend/views/test/index.php
clear
Merge remote-tracking branch 'origin/test'

Conflicts:
	frontend/views/test/index.php
Merge branch 'test'