Terms of use, first use view added
Merge remote-tracking branch 'origin/master'