Merge pull request #60 from elitenomad/marcus

Marcus
Merge pull request #61 from elitenomad/marcus

missing div on application layout
Edit profile page
Merge branch 'master' into Pranava_Users
cosmetic fixes
Merge pull request #62 from elitenomad/Pranava_Users

Pranava users
Adding the sendgrid details
Merge branch 'master' into Pranava_Users
footer fixed to bottom of the page
Merge branch 'master' into federico

conflict merge
Conflicts:
	app/assets/stylesheets/custom.css.scss
Merge pull request #64 from elitenomad/Pranava_Users

Pranava users
Fixed Membership controller issue
Merge pull request #65 from elitenomad/Pranava_Users

Fixed Membership controller issue
Merge pull request #63 from elitenomad/federico

Federico
group index page conflict fix