Merge branch 'dev'
Merge branch 'master' of https://github.com/shrutijalewar/white-van
Merge pull request #10 from shrutijalewar/views

Added mapMarkers, hide subject in send message form
Merge pull request #11 from shrutijalewar/backend-setup

Backend setup
Merge branch 'master' of https://github.com/shrutijalewar/white-van
merge home index
home-page
photo upload and carousel example in user profile gallery
added new users img dir to .gitignore
profile photo change form added
style.css removed
making grunt happy
bribe center routes completed through purchase
Merge pull request #12 from shrutijalewar/backend-setup

profile photo change form added
commented out post /charge to make travis happy
twilio and mailgun-js installed / saved
Merge pull request #14 from shrutijalewar/dev

home-page
removing style.css
internal messaging working
initial query by isPublic, and excluding the current user