Again fix #1

Half credit goes to Sharif
Merge branch 'feature_content_details'
Merge branch 'master' of https://github.com/Apptitive/Apptitive-Content-Display
Merge branch 'master' of https://github.com/Apptitive/Apptitive-Content-Display