Added hyb_map and hyb_farm skeletons
Update form 'master' into rewrite_assembler

Conflicts:
	src/sk_assembler.erl
	src/sk_farm.erl
	src/sk_map.erl

Mainly due to introductio of new sceletons on top of changed skeleto assembly.