added configure to .gitignore
merged master into ws1314_2