Merge branch 'master' of https://github.com/abcdw/aanalyzer

Conflicts:
	src/astree.cpp
Merge branch 'master' of https://github.com/abcdw/aanalyzer