asd
Merge branch 'master' of https://github.com/jetsekoopmans/pancake_cms

Conflicts:
	db/schema.rb