Change-Id: Iae0ac01cd82ce9d086acef8392ee4f52d23974c2
Signed-off-by: Mariusz Kraj <m.kraj@futbolowo.pl>
Merge branch 'master' of https://github.com/mariusz-kraj/ftb20.git

Conflicts:
	application/layouts/scripts/layout.phtml

Change-Id: Ia57a26c85739c1fd5f3825739c9fefc8e529d893
Signed-off-by: Mariusz Kraj <m.kraj@futbolowo.pl>