make cmakefile to compatiable with g++-4.6 and 4.7
Merge branch 'dev'