add tests project, switch to vs2013
Merge branch 'mymaster'