Added terms and conditions
Merged master to implement november changes
fixed merge conflict