Merge branch 'master' of kreusspitze:/home/stefanm/git-repos/insieme_base

Conflicts:
	code/driver/src/integration_tests.cxx
Merge branch 'master' of kreusspitze:/home/luis/git-repos/insieme_base
Merge branch 'master' of kreusspitze:/home/luis/git-repos/insieme_base
Merge branch 'master' of kreusspitze:/home/luis/git-repos/insieme_base
fixed bug in getRootVariable
Merge branch 'master' of kreusspitze:/git-repos/insieme_base
changed temporals from Variable to Expression
Added LENIENCY_FACTOR to maintenance thread test
adding globals as candidates too
adding globals as candidates too
Merge branch 'master' of kreusspitze:/git-repos/insieme_base
fixed bug in finding marshalling points
Merge branch 'master' of kreusspitze:/git-repos/insieme_base

Conflicts:
	code/transform/include/insieme/transform/datalayout/aos_to_soa.h
	code/transform/src/datalayout/aos_to_soa.cpp
fixed merge
Maintenance test: parantheses are a good thing to use in macros
changed interface of fixTypes function
Merge branch 'master' of kreusspitze:/git-repos/insieme_base
Merge branch 'master' of kreusspitze:/git-repos/insieme_base
fixed interface in testcase
Merge branch 'master' of kreusspitze:/git-repos/insieme_base