merge conflict in gemfile
added language information to public schedule output
merge conflict day.html.haml
added tracks to public schedule, first draft
added icons in track view
added link to workshop registration for linuxwochen 2013 in day view
added lageplan to schedule
added track color to xml output
merged frab master
fixed merge conflict
Merge branch 'master' of https://github.com/daja77/frab

Conflicts:
	app/models/event.rb