Merge branches 'develop' and 'master'
Added images for portfolio
Added haml ability to content items
Moved portfolio to haml