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
d 555
Merge branch 'new1' into d

Conflicts:
	frontend/views/test/index.php