Merge branch 'master' into devel
...
continued work on attribute resolver
Started integration of attribute resolver
created attribute resolver