Improved the frontend look and feel
Merge branch 'develop' into frontend-lifting

Conflicts:
	app/views/omniauth_callbacks/heroku.html.erb
Fixing cucumber tests
Merge pull request #4 from maliciousmind/frontend-lifting

Improved the frontend look and feel