changed text on about page, added links to portfolio and added links to twitter and FB in footer
changed link to Roy his portfolio
Merge branch 'master' into mauries
added header
Merge branch 'master' of https://github.com/Zwooosh/MT-Identity

Conflicts:
	app/views/users/show.html.haml
Merge branch 'master' into mauries
profile page styled
styled profile page, added description field, changed footers for projects and dashboard, changed english labels and buttons to dutch
edited forms, translations in cms
added projects from users to their profile page
added select2, edited user form, added users tab at dashboard
schema updated
updated schema
added infinite scroll, styled profile page
fixed images on profile page
removed border
conflict resolved
gemfile conflict resolved