added proper error message to terms and conditions
Merge branch '0.2.7.1' into testmerge