Merge branch 'develop'
Merge pull request #6 from HashCookies/develop

Develop
Merge branch 'develop'
Merge branch 'master' of github.com:HashCookies/goaprop
Changes made on Production site
reverting old app.rb
Editing copy in services section
Merge pull request #7 from HashCookies/content

Editing copy in services section
Merge pull request #8 from HashCookies/develop

Develop
Merge branch 'develop'
Changing Find Properties behavior