In the middle of a merge
Merge branch 'dsl' of https://github.com/jaynel/uffda into jaynel-dsl

Conflicts:
	test/test_commons/tc_proper_model.erl
Merge branch 'jaynel-dsl'
Removed registering the nodename to targets
Renamed priv dir and data file for simple_name_model