Conflicts while creating events. Conflicts on the users main page.
Merge branch 'master' of github.com:danickfort/xtable

Conflicts:
	app/views/groups/show.html.erb
	app/views/staticcontent/home.html.erb