added layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	backend/code/var/api/app/config/fbg.php
added layout