badges, IE placeholders
profile
feedback
merge index.html
Merge branch 'danny'

Conflicts:
	zaplings/templates/zaplings/index.html