dco 1628 layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	AirportCarpool/AirportCarpool/Controllers/AccountController.cs
	AirportCarpool/AirportCarpool/Views/Account/UserProfile.cshtml
Merge branch 'master' of https://github.com/OrganiHackathon/airport-carpooling.git