Terms and conditions.
Merge branch 'dev' of https://github.com/floored/floored.github.com into dev