start timeline, add masonry
fix not being able to creat cards, fix display of html fields
image uploader cards
faker data
migrate
Merge branch 'timeline' of https://github.com/Zwooosh/MT-Identity into cms
fix overlapping content
Merge branch 'timeline' into cms
metrostation changed
better qr code
Merge branch 'cms' of github.com:Zwooosh/MT-Identity into cms
add links to timeline
change development db back to sqlite3
add dummy data for users ands cards
added h3 css, filled about page and changed footer
facebook and twitter logo added in the footer
changed text, added logo with link to our blog
inserted google maps and contact person information
added user fields, added form fields, changed user page
Merge branch 'mauries'

Conflicts:
	Gemfile