UI - missing files
Merge branch 'user_interface' of https://github.com/ASE2014/elis into user_interface

Conflicts:
	app/views/tournaments/edit.html.haml