last changes
add automatic analysis code
add c++11 flag
resolve conflict
cmake and make modification for merging repositories