work towards fix
Merged from develop
merged develop into Name-Resolver
Merge branch 'WarningFixes' into Name-Resolver

Conflicts:
	src/Language/Clafer.hs
	src/Language/Clafer/Generator/Alloy.hs
	src/Language/Clafer/Intermediate/ResolverInheritance.hs
	src/Language/Clafer/Intermediate/ResolverType.hs
	src/Language/ClaferT.hs
	src/clafer.hs
	test/Makefile
	test/failing/positive/grammar/u_abstract_extends_integer.cfr
	test/failing/positive/grammar/u_abstract_under_abstract.cfr
	test/failing/positive/grammar/u_abstract_with_gcard.cfr
	test/failing/positive/grammar/u_clafer_named_integer.cfr
	test/failing/positive/grammar/u_two_superclafers_with_same_subclafer.cfr
	test/grammar/failing/grammar/u_abstract_extends_integer.cfr
	test/grammar/failing/grammar/u_abstract_under_abstract.cfr
	test/grammar/failing/grammar/u_abstract_with_gcard.cfr
	test/grammar/failing/grammar/u_clafer_named_integer.cfr
	test/grammar/failing/grammar/u_two_superclafers_with_same_subclafer.cfr
	test/grammar/negative/n_circularity1.cfr
	test/grammar/negative/n_circularity2.cfr
	test/grammar/negative/n_circularity_in_subclafers.cfr
	test/grammar/negative/n_inherit_from_non_abstract.cfr
	test/grammar/negative/n_multiple_clafer_on_one_line.cfr
	test/negative/grammar/n_circularity1.cfr
	test/negative/grammar/n_circularity2.cfr
	test/negative/grammar/n_circularity_in_subclafers.cfr
	test/negative/grammar/n_inherit_from_non_abstract.cfr
	test/negative/grammar/n_multiple_clafer_on_one_line.cfr
	test/positive/grammar/n_circularity1.cfr
	test/positive/grammar/n_circularity2.cfr
	test/positive/grammar/n_circularity_in_subclafers.cfr
	test/positive/grammar/n_inherit_from_non_abstract.cfr
	test/positive/grammar/n_multiple_clafer_on_one_line.cfr
	test/positive/grammar/u_abstract_extends_integer.cfr
	test/positive/grammar/u_abstract_under_abstract.cfr
	test/positive/grammar/u_abstract_with_gcard.cfr
	test/positive/grammar/u_clafer_named_integer.cfr
	test/positive/grammar/u_two_superclafers_with_same_subclafer.cfr
Merge branch 'WarningFixes' into Name-Resolver
Implemented Inheritance among concrete clafers

Note this does not check or enforce cardinalities
see:
http://gsd.uwaterloo.ca:8888/question/917/inheritance-among-concrete-clafers
Added Test Files
Merge branch 'WarningFixes' into Name-Resolver
Cleaned up implementation
Merge branch 'WarningFixes' into Name-Resolver
Merge branch 'WarningFixes' into Name-Resolver
Updated the alloy generation to support the hierarchy
Fixed istop function that was given incorrect results
Fixed a merge issue from WarningFixes
Fixed i228

http://gsd.uwaterloo.ca:8888/question/952/resolve-types-for-this-and-parent-expressions

and other such fixes
Fixed some bugs from previous commit
Fixed a bug in hierarchy where one could not refer to a clafer two hierarchy deep that was not defined in the first depth
Started work towards fixing 'if clafer has same name as a top level abstract clafer it is an instance of it'
small adjustments for corner cases
merged `WarningFixes` into `Hierarchy`