Design

Avatar next to stat and not upper
Home & rules page
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/View/Arenas/fighter.ctp
	app/tmp/cache/models/myapp_cake_model_default_webarena_list
	app/tmp/cache/models/myapp_cake_model_default_webarena_players
	app/tmp/cache/models/myapp_cake_model_default_webarena_surroundings
	app/tmp/cache/models/myapp_cake_model_default_webarena_tools
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache
	app/tmp/logs/error.log