jav.

Signed-off-by: Balázs <balazs@balazs-Inspiron-N7010.(none)>
Merge branch 'master' of github.com:pixelephant/angolozz

Conflicts:
	app/View/Elements/unit_result/unit_result_pattern.ctp

Signed-off-by: Balázs <balazs@balazs-Inspiron-N7010.(none)>