Deleted username from front and backend
Merge branch 'v2' of http://github.com/yeaz/dancespace into v2

Conflicts:
	app/views/users/index.html.erb