merge with master
Merge branch 'master' of https://github.com/Apptitive/Apptitive-Content-Display