Merge conflicts + event playlist
Merge branch 'fe-first-version' of github.com:samirfors/mhd2013-app into fe-first-version

Conflicts:
	index.html